Merge "Simplify cached check in Special:SpecialPages"

diff --combined includes/SpecialPage.php
index 816831f,f5eccd5..67aa2b3
--- 1/includes/SpecialPage.php
--- 2/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@@ -513,6 -513,19 +513,19 @@@ class SpecialPage 
                return false;
        }
  
+       /**
+        * Is this page cached?
+        * Expensive pages are cached or disabled in miser mode.
+        * Used by QueryPage and subclasses, moved here so that
+        * Special:SpecialPages can safely call it for all special pages.
+        *
+        * @return Boolean
+        * @since 1.21
+        */
+       public function isCached() {
+               return false;
+       }
+ 
        /**
         * Can be overridden by subclasses with more complicated permissions
         * schemes.
@@@ -1017,12 -1030,14 +1030,12 @@@ abstract class RedirectSpecialPage exte
                if ( $redirect instanceof Title ) {
                        $url = $redirect->getFullUrl( $query );
                        $this->getOutput()->redirect( $url );
 -                      wfProfileOut( __METHOD__ );
                        return $redirect;
                // Redirect to index.php with query parameters
                } elseif ( $redirect === true ) {
                        global $wgScript;
                        $url = $wgScript . '?' . wfArrayToCGI( $query );
                        $this->getOutput()->redirect( $url );
 -                      wfProfileOut( __METHOD__ );
                        return $redirect;
                } else {
                        $class = __CLASS__;
@@@ -1207,7 -1222,7 +1220,7 @@@ abstract class RedirectSpecialArticle e
                        'ctype', 'maxage', 'smaxage',
                );
  
 -              wfRunHooks( "RedirectSpecialArticleRedirectParams", array(&$redirectParams) );
 +              wfRunHooks( "RedirectSpecialArticleRedirectParams", array( &$redirectParams ) );
                $this->mAllowedRedirectParams = $redirectParams;
        }
  }