Merge "mediawiki.page.gallery.resize: Remove weird mw.hook call"

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

diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php
index 53cef7f..9ff96ab 100644 (file)
--- a/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@ -183,6 +183,7 @@ class SpecialPageFactory {
                global $wgSpecialPages;
                global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication;
                global $wgEnableEmail, $wgEnableJavaScriptTest;
+               global $wgPageLanguageUseDB;
 
                if ( !is_object( self::$list ) ) {
                        wfProfileIn( __METHOD__ );
@@ -208,6 +209,10 @@ class SpecialPageFactory {
                                self::$list['JavaScriptTest'] = 'SpecialJavaScriptTest';
                        }
 
+                       if ( $wgPageLanguageUseDB ) {
+                               self::$list['PageLanguage'] = 'SpecialPageLanguage';
+                       }
+
                        self::$list['Activeusers'] = 'SpecialActiveUsers';
 
                        // Add extension special pages
@@ -347,10 +352,10 @@ class SpecialPageFactory {
 
                                return new $className;
                        } elseif ( is_array( $rec ) ) {
-                               // @deprecated, officially since 1.18, unofficially since forever
-                               wfDebug( "Array syntax for \$wgSpecialPages is deprecated, " .
-                                       "define a subclass of SpecialPage instead." );
                                $className = array_shift( $rec );
+                               // @deprecated, officially since 1.18, unofficially since forever
+                               wfDeprecated( "Array syntax for \$wgSpecialPages is deprecated ($className), " .
+                                       "define a subclass of SpecialPage instead.", '1.18' );
                                self::getList()->$realName = MWFunction::newObj( $className, $rec );
                        }
 
@@ -364,8 +369,8 @@ class SpecialPageFactory {
         * Return categorised listable special pages which are available
         * for the current user, and everyone.
         *
-        * @param User $user User object to check permissions, $wgUser will be used if
-        *   if not provided
+        * @param User $user User object to check permissions, $wgUser will be used
+        *        if not provided
         * @return array ( string => Specialpage )
         */
        public static function getUsablePages( User $user = null ) {