Merge "New Hook rc/watchlist hook ChangesListBegin"

diff --combined RELEASE-NOTES-1.23
index 9633edd,4e00d40..3214ace
--- 1/RELEASE-NOTES-1.23
--- 2/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@@ -50,7 -50,6 +50,7 @@@ production
    prepended to the start of this array.
  * $wgQueryPages has been removed. Query Pages should be added to by using the
    wgQueryPages hook.
 +* $wgHttpOnlyBlacklist has been removed.
  
  === New features in 1.23 ===
  * ResourceLoader can utilize the Web Storage API to cache modules client-side.
@@@ -131,6 -130,8 +131,8 @@@
  * Added BaseTemplateAfterPortlet hook to allow injecting html after portlets in skins.
  * Support has been added for a JSON based localisation file format. The
    installer has been updated to use it.
+ * Add new hooks OldChangesListBegin and EnhancedChangesListBegin hooks to allow
+   extensions a chance to batch process the result set prior to rendering.
  
  === Bug fixes in 1.23 ===
  * (bug 41759) The "updated since last visit" markers (on history pages, recent

diff --combined includes/specials/SpecialRecentchanges.php
index 2c563c6,885e4cf..e2fd129
--- 1/includes/specials/SpecialRecentchanges.php
--- 2/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@@ -45,7 -45,6 +45,7 @@@ class SpecialRecentChanges extends Chan
                        $query = $this->getFeedQuery();
                        $query['feedformat'] = $feedFormat === 'atom' ? 'atom' : 'rss';
                        $this->getOutput()->redirect( wfAppendQuery( wfScript( 'api' ), $query ) );
 +
                        return;
                }
  
@@@ -273,7 -272,6 +273,7 @@@
                if ( $query['limit'] > $wgFeedLimit ) {
                        $query['limit'] = $wgFeedLimit;
                }
 +
                return $query;
        }
  
@@@ -297,7 -295,7 +297,7 @@@
                $counter = 1;
                $list = ChangesList::newFromContext( $this->getContext() );
  
-               $rclistOutput = $list->beginRecentChangesList();
+               $rclistOutput = $list->beginRecentChangesList( $rows );
                foreach ( $rows as $obj ) {
                        if ( $limit == 0 ) {
                                break;
@@@ -494,7 -492,6 +494,7 @@@
        public function checkLastModified() {
                $dbr = $this->getDB();
                $lastmod = $dbr->selectField( 'recentchanges', 'MAX(rc_timestamp)', false, __METHOD__ );
 +
                return $lastmod;
        }
  

diff --combined includes/specials/SpecialWatchlist.php
index 68a514c,7c3002d..4bf6c79
--- 1/includes/specials/SpecialWatchlist.php
--- 2/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@@ -58,7 -58,6 +58,7 @@@ class SpecialWatchlist extends ChangesL
                        }
  
                        $output->redirect( $title->getLocalURL() );
 +
                        return;
                }
  
@@@ -67,13 -66,11 +67,13 @@@
                $user = $this->getUser();
                $opts = $this->getOptions();
  
 -              if ( ( $wgEnotifWatchlist || $wgShowUpdatedMarker ) && $request->getVal( 'reset' ) &&
 -                      $request->wasPosted() )
 -              {
 +              if ( ( $wgEnotifWatchlist || $wgShowUpdatedMarker )
 +                      && $request->getVal( 'reset' )
 +                      && $request->wasPosted()
 +              ) {
                        $user->clearAllNotifications();
                        $output->redirect( $this->getPageTitle()->getFullURL( $opts->getChangedValues() ) );
 +
                        return;
                }
  
@@@ -148,7 -145,6 +148,7 @@@
                // methods defined on WebRequest and removing this dependency would cause some code duplication.
                $request = new DerivativeRequest( $this->getRequest(), $params );
                $opts->fetchValuesFromRequest( $request );
 +
                return $opts;
        }
  
@@@ -321,7 -317,8 +321,8 @@@
                $list = ChangesList::newFromContext( $this->getContext() );
                $list->setWatchlistDivs();
  
-               $s = $list->beginRecentChangesList();
+               $s = $list->beginRecentChangesList( $rows );
+               $dbr->dataSeek( $rows, 0 );
                $counter = 1;
                foreach ( $rows as $obj ) {
                        # Make RC entry
@@@ -383,8 -380,7 +384,8 @@@
                if ( $opts['days'] > 0 ) {
                        $timestamp = wfTimestampNow();
                        $wlInfo = $this->msg( 'wlnote2' )->numParams( round( $opts['days'] * 24 ) )->params(
 -                              $lang->userDate( $timestamp, $user ), $lang->userTime( $timestamp, $user ) )->parse() . "<br />\n";
 +                              $lang->userDate( $timestamp, $user ), $lang->userTime( $timestamp, $user )
 +                      )->parse() . "<br />\n";
                }
  
                $nondefaults = $opts->getChangedValues();
@@@ -562,7 -558,6 +563,7 @@@
                foreach ( $days as $d ) {
                        $days[$i++] = $this->daysLink( $d, $options );
                }
 +
                return $this->msg( 'wlshowlast' )->rawParams(
                        $this->getLanguage()->pipeList( $hours ),
                        $this->getLanguage()->pipeList( $days ),