Revert r104659 and its followup r104665: break the unit tests with a fatal error...

[lhc/web/wiklou.git] / includes / SpecialPageFactory.php

diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 2b8e173..b6aa423 100644 (file)
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -339,18 +339,21 @@ class SpecialPageFactory {
         * Return categorised listable special pages which are available
         * for the current user, and everyone.
         *
+        * @param $user User object to check permissions, $wgUser will be used
+        *              if not provided
         * @return Array( String => Specialpage )
         */
-       public static function getUsablePages() {
-               global $wgUser;
+       public static function getUsablePages( User $user = null ) {
                $pages = array();
+               if ( $user === null ) {
+                       global $wgUser;
+                       $user = $wgUser;
+               }
                foreach ( self::getList() as $name => $rec ) {
                        $page = self::getPage( $name );
-                       if ( $page->isListed()
-                               && (
-                                       !$page->isRestricted()
-                                       || $page->userCanExecute( $wgUser )
-                               )
+                       if ( $page // not null
+                               && $page->isListed()
+                               && ( !$page->isRestricted() || $page->userCanExecute( $user ) )
                        ) {
                                $pages[$name] = $page;
                        }
@@ -405,12 +408,12 @@ class SpecialPageFactory {
         * page, and true if it was successful.
         *
         * @param $title          Title object
-        * @param $context        RequestContext
+        * @param $context        IContextSource
         * @param $including      Bool output is being captured for use in {{special:whatever}}
         *
         * @return bool
         */
-       public static function executePath( Title &$title, RequestContext &$context, $including = false ) {
+       public static function executePath( Title &$title, IContextSource &$context, $including = false ) {
                wfProfileIn( __METHOD__ );
 
                // @todo FIXME: Redirects broken due to this call
@@ -451,7 +454,7 @@ class SpecialPageFactory {
                                wfProfileOut( __METHOD__ );
                                return $title;
                        } else {
-                               $context->setTitle( $page->getTitle() );
+                               $context->setTitle( $page->getTitle( $par ) );
                        }
 
                } elseif ( !$page->isIncludable() ) {
@@ -472,20 +475,20 @@ class SpecialPageFactory {
 
        /**
         * Just like executePath() but will override global variables and execute
-        * the page in "inclusion" mode. Returns true if the excution was successful
-        * or false if there was no such special page, or a title object if it was
-        * a redirect.
+        * the page in "inclusion" mode. Returns true if the execution was
+        * successful or false if there was no such special page, or a title object
+        * if it was a redirect.
         *
         * Also saves the current $wgTitle, $wgOut, $wgRequest, $wgUser and $wgLang
         * variables so that the special page will get the context it'd expect on a
         * normal request, and then restores them to their previous values after.
         *
         * @param $title Title
-        * @param $context RequestContext
+        * @param $context IContextSource
         *
         * @return String: HTML fragment
         */
-       static function capturePath( Title $title, RequestContext $context ) {
+       static function capturePath( Title $title, IContextSource $context ) {
                global $wgOut, $wgTitle, $wgRequest, $wgUser, $wgLang;
 
                // Save current globals
@@ -500,12 +503,12 @@ class SpecialPageFactory {
                $wgOut = $context->getOutput();
                $wgRequest = $context->getRequest();
                $wgUser = $context->getUser();
-               $wgLang = $context->getLang();
+               $wgLang = $context->getLanguage();
 
                // The useful part
                $ret = self::executePath( $title, $context, true );
 
-               // And restore that globals
+               // And restore the old globals
                $wgTitle = $oldTitle;
                $wgOut = $oldOut;
                $wgRequest = $oldRequest;