Merge "Fix deprecated hooks not having a non-deprecated alternative"

diff --combined includes/specialpage/ChangesListSpecialPage.php
index 3c8bdcc,0408182..806a48a
--- 1/includes/specialpage/ChangesListSpecialPage.php
--- 2/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@@ -53,8 -53,7 +53,8 @@@ abstract class ChangesListSpecialPage e
                $opts = $this->getOptions();
                if ( $rows === false ) {
                        if ( !$this->including() ) {
 -                              $this->doHeader( $opts );
 +                              $this->doHeader( $opts, 0 );
 +                              $this->getOutput()->setStatusCode( 404 );
                        }
  
                        return;
@@@ -291,8 -290,8 +291,8 @@@
                        ''
                );
  
-               if ( !wfRunHooks( 'ChangesListSpecialPageQuery',
-                       array( $this->getName(), &$tables, &$fields, &$conds, &$query_options, &$join_conds, $opts ) )
+               if ( !$this->runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds,
+                       $opts )
                ) {
                        return false;
                }
@@@ -309,6 -308,13 +309,13 @@@
                );
        }
  
+       protected function runMainQueryHook( &$tables, &$fields, &$conds, &$query_options, &$join_conds, $opts ) {
+               return wfRunHooks(
+                       'ChangesListSpecialPageQuery',
+                       array( $this->getName(), &$tables, &$fields, &$conds, &$query_options, &$join_conds, $opts )
+               );
+       }
+ 
        /**
         * Return a DatabaseBase object for reading
         *
@@@ -327,7 -333,7 +334,7 @@@
        public function webOutput( $rows, $opts ) {
                if ( !$this->including() ) {
                        $this->outputFeedLinks();
 -                      $this->doHeader( $opts );
 +                      $this->doHeader( $opts, $rows->numRows() );
                }
  
                $this->outputChangesList( $rows, $opts );
@@@ -349,12 -355,12 +356,12 @@@
        abstract public function outputChangesList( $rows, $opts );
  
        /**
 -       * Return the text to be displayed above the changes
 +       * Set the text to be displayed above the changes
         *
         * @param FormOptions $opts
 -       * @return string XHTML
 +       * @param int $numRows Number of rows in the result to show after this header
         */
 -      public function doHeader( $opts ) {
 +      public function doHeader( $opts, $numRows ) {
                $this->setTopText( $opts );
  
                // @todo Lots of stuff should be done here.

diff --combined includes/specials/SpecialRecentchanges.php
index a2e271e,c0645e1..ea785fa
--- 1/includes/specials/SpecialRecentchanges.php
--- 2/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@@ -229,9 -229,8 +229,8 @@@ class SpecialRecentChanges extends Chan
                        $opts['tagfilter']
                );
  
-               if ( !wfRunHooks( 'SpecialRecentChangesQuery',
-                       array( &$conds, &$tables, &$join_conds, $opts, &$query_options, &$fields ),
-                       '1.23' )
+               if ( !$this->runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds,
+                       $opts )
                ) {
                        return false;
                }
@@@ -255,6 -254,15 +254,15 @@@
                return $rows;
        }
  
+       protected function runMainQueryHook( &$tables, &$fields, &$conds, &$query_options, &$join_conds, $opts ) {
+               return parent::runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds, $opts )
+                       && wfRunHooks(
+                               'SpecialRecentChangesQuery',
+                               array( &$conds, &$tables, &$join_conds, $opts, &$query_options, &$fields ),
+                               '1.23'
+                       );
+       }
+ 
        public function outputFeedLinks() {
                $this->addFeedLinks( $this->getFeedQuery() );
        }
@@@ -344,21 -352,18 +352,21 @@@
                                $this->msg( 'recentchanges-noresult' )->parse() .
                                '</div>'
                        );
 +                      if ( !$this->including() ) {
 +                              $this->getOutput()->setStatusCode( 404 );
 +                      }
                } else {
                        $this->getOutput()->addHTML( $rclistOutput );
                }
        }
  
        /**
 -       * Return the text to be displayed above the changes
 +       * Set the text to be displayed above the changes
         *
         * @param FormOptions $opts
 -       * @return string XHTML
 +       * @param int $numRows Number of rows in the result to show after this header
         */
 -      public function doHeader( $opts ) {
 +      public function doHeader( $opts, $numRows ) {
                global $wgScript;
  
                $this->setTopText( $opts );
@@@ -368,7 -373,7 +376,7 @@@
  
                $panel = array();
                $panel[] = self::makeLegend( $this->getContext() );
 -              $panel[] = $this->optionsPanel( $defaults, $nondefaults );
 +              $panel[] = $this->optionsPanel( $defaults, $nondefaults, $numRows );
                $panel[] = '<hr />';
  
                $extraOpts = $this->getExtraOptions( $opts );
@@@ -643,10 -648,9 +651,10 @@@
         *
         * @param array $defaults
         * @param array $nondefaults
 +       * @param int $numRows Number of rows in the result to show after this header
         * @return string
         */
 -      function optionsPanel( $defaults, $nondefaults ) {
 +      function optionsPanel( $defaults, $nondefaults, $numRows ) {
                global $wgRCLinkLimits, $wgRCLinkDays;
  
                $options = $nondefaults + $defaults;
@@@ -660,15 -664,10 +668,15 @@@
                $lang = $this->getLanguage();
                $user = $this->getUser();
                if ( $options['from'] ) {
 -                      $note .= $this->msg( 'rcnotefrom' )->numParams( $options['limit'] )->params(
 -                              $lang->userTimeAndDate( $options['from'], $user ),
 -                              $lang->userDate( $options['from'], $user ),
 -                              $lang->userTime( $options['from'], $user ) )->parse() . '<br />';
 +                      $note .= $this->msg( 'rcnotefrom' )
 +                              ->numParams( $options['limit'] )
 +                              ->params(
 +                                      $lang->userTimeAndDate( $options['from'], $user ),
 +                                      $lang->userDate( $options['from'], $user ),
 +                                      $lang->userTime( $options['from'], $user )
 +                              )
 +                              ->numParams( $numRows )
 +                              ->parse() . '<br />';
                }
  
                # Sort data for display and make sure it's unique after we've added user data.

diff --combined includes/specials/SpecialWatchlist.php
index b2574e0,1db1d04..5691e50
--- 1/includes/specials/SpecialWatchlist.php
--- 2/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@@ -83,7 -83,7 +83,7 @@@ class SpecialWatchlist extends ChangesL
         * Return an array of subpages beginning with $search that this special page will accept.
         *
         * @param string $search Prefix to search for
 -       * @param integer $limit Maximum number of results to return
 +       * @param int $limit Maximum number of results to return
         * @return string[] Matching subpages
         */
        public function prefixSearchSubpages( $search, $limit = 10 ) {
@@@ -258,7 -258,7 +258,7 @@@
                // the necessary rights.
                if ( !$user->isAllowed( 'deletedhistory' ) ) {
                        $bitmask = LogPage::DELETED_ACTION;
 -              } elseif ( !$user->isAllowed( 'suppressrevision' ) ) {
 +              } elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
                        $bitmask = LogPage::DELETED_ACTION | LogPage::DELETED_RESTRICTED;
                } else {
                        $bitmask = 0;
@@@ -279,9 -279,7 +279,7 @@@
                        ''
                );
  
-               wfRunHooks( 'SpecialWatchlistQuery',
-                       array( &$conds, &$tables, &$join_conds, &$fields, $opts ),
-                       '1.23' );
+               $this->runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds, $opts );
  
                return $dbr->select(
                        $tables,
@@@ -293,6 -291,15 +291,15 @@@
                );
        }
  
+       protected function runMainQueryHook( &$tables, &$fields, &$conds, &$query_options, &$join_conds, $opts ) {
+               return parent::runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds, $opts )
+                       && wfRunHooks(
+                               'SpecialWatchlistQuery',
+                               array( &$conds, &$tables, &$join_conds, &$fields, $opts ),
+                               '1.23'
+                       );
+       }
+ 
        /**
         * Return a DatabaseBase object for reading
         *
@@@ -388,12 -395,12 +395,12 @@@
        }
  
        /**
 -       * Return the text to be displayed above the changes
 +       * Set the text to be displayed above the changes
         *
         * @param FormOptions $opts
 -       * @return string XHTML
 +       * @param int $numRows Number of rows in the result to show after this header
         */
 -      public function doHeader( $opts ) {
 +      public function doHeader( $opts, $numRows ) {
                $user = $this->getUser();
  
                $this->getOutput()->addSubtitle(
@@@ -407,7 -414,7 +414,7 @@@
                $wlInfo = '';
                if ( $opts['days'] > 0 ) {
                        $timestamp = wfTimestampNow();
 -                      $wlInfo = $this->msg( 'wlnote2' )->numParams( round( $opts['days'] * 24 ) )->params(
 +                      $wlInfo = $this->msg( 'wlnote' )->numParams( $numRows, round( $opts['days'] * 24 ) )->params(
                                $lang->userDate( $timestamp, $user ), $lang->userTime( $timestamp, $user )
                        )->parse() . "<br />\n";
                }