*grumble grumble* know it alls think I'm abusing $wgMiserMode. So fine, have a SHINY...

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

diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 290f115..27cdc3e 100644 (file)
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -126,8 +126,6 @@ class SpecialPageFactory {
                // Page tools
                'ComparePages'              => 'SpecialComparePages',
                'Export'                    => 'SpecialExport',
-               'GlobalFileUsage'           => 'SpecialGlobalFileUsage',
-               'GlobalTemplateUsage'       => 'SpecialGlobalTemplateUsage',
                'Import'                    => 'SpecialImport',
                'Undelete'                  => 'SpecialUndelete',
                'Whatlinkshere'             => 'SpecialWhatlinkshere',
@@ -264,7 +262,7 @@ class SpecialPageFactory {
        /**
         * Add a page to a certain display group for Special:SpecialPages
         *
-        * @param $page SpecialPage|string
+        * @param $page Mixed: SpecialPage or string
         * @param $group String
         */
        public static function setGroup( $page, $group ) {
@@ -277,8 +275,6 @@ class SpecialPageFactory {
         * Get the group that the special page belongs in on Special:SpecialPage
         *
         * @param $page SpecialPage
-        *
-        * @return string
         */
        public static function getGroup( &$page ) {
                $name = $page->getName();
@@ -343,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;
                        }