Merge "Remove m prefixes from private variables"

diff --combined docs/hooks.txt
index 834d008,0c815f5..15387f8
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -898,7 -898,7 +898,7 @@@ $oldid: oldid (int) being viewe
  'DoEditSectionLink': Override the HTML generated for section edit links
  $skin: Skin object rendering the UI
  $title: Title object for the title being linked to (may not be the same as
 -  $wgTitle, if the section is included from a template)
 +  the page title, if the section is included from a template)
  $section: The designation of the section being pointed to, to be included in
    the link, like "&section=$section"
  $tooltip: The default tooltip.  Escape before using.
@@@ -1369,7 -1369,7 +1369,7 @@@ $context: IContextSource objec
  &$pageInfo: Array of information
  
  'InitializeArticleMaybeRedirect': MediaWiki check to see if title is a redirect.
 -$title: Title object ($wgTitle)
 +$title: Title object for the current page
  $request: WebRequest
  $ignoreRedirect: boolean to skip redirect check
  $target: Title/string of redirect target
@@@ -1624,7 -1624,7 +1624,7 @@@ something completely different, after t
  before ordinary actions take place.
  $output: $wgOut
  $article: Article on which the action will be performed
 -$title: $wgTitle
 +$title: Title on which the action will be performed
  $user: $wgUser
  $request: $wgRequest
  $mediaWiki: The $mediawiki object
@@@ -2248,7 -2248,7 +2248,7 @@@ $special: the special page objec
    name/URL parameters. Each key maps to an associative array with a 'msg'
    (message key) and a 'default' value.
  
- 'SpecialPage_initList': Called when setting up SpecialPage::$mList, use this
+ 'SpecialPage_initList': Called when setting up SpecialPageFactory::$list, use this
  hook to remove a core special page.
  $list: list (array) of core special pages
  

diff --combined includes/SpecialPageFactory.php
index 9542654,179f7f5..30eb129
--- 1/includes/SpecialPageFactory.php
--- 2/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@@ -37,7 -37,7 +37,7 @@@
   * and bails out if not.
   *
   * To add a core special page, use the similar static list in
-  * SpecialPage::$mList. To remove a core static special page at runtime, use
+  * SpecialPageFactory::$list. To remove a core static special page at runtime, use
   * a SpecialPage_initList hook.
   *
   * @ingroup SpecialPage
@@@ -48,7 -48,7 +48,7 @@@ class SpecialPageFactory 
        /**
         * List of special page names to the subclass of SpecialPage which handles them.
         */
-       private static $mList = array(
+       private static $list = array(
                // Maintenance Reports
                'BrokenRedirects'           => 'BrokenRedirectsPage',
                'Deadendpages'              => 'DeadendpagesPage',
@@@ -149,7 -149,6 +149,7 @@@
                'Undelete'                  => 'SpecialUndelete',
                'Whatlinkshere'             => 'SpecialWhatlinkshere',
                'MergeHistory'              => 'SpecialMergeHistory',
 +              'ExpandTemplates'           => 'SpecialExpandTemplates',
  
                // Other
                'Booksources'               => 'SpecialBookSources',
@@@ -170,11 -169,10 +170,10 @@@
                'Userlogout'                => 'SpecialUserlogout',
        );
  
-       private static $mAliases;
+       private static $aliases;
  
        /**
-        * Initialise the special page list
-        * This must be called before accessing SpecialPage::$mList
+        * Get the special page list
         *
         * @return array
         */
@@@ -183,43 -181,43 +182,43 @@@
                global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication;
                global $wgEnableEmail, $wgEnableJavaScriptTest;
  
-               if ( !is_object( self::$mList ) ) {
+               if ( !is_object( self::$list ) ) {
                        wfProfileIn( __METHOD__ );
  
                        if ( !$wgDisableCounters ) {
-                               self::$mList['Popularpages'] = 'PopularpagesPage';
+                               self::$list['Popularpages'] = 'PopularpagesPage';
                        }
  
                        if ( !$wgDisableInternalSearch ) {
-                               self::$mList['Search'] = 'SpecialSearch';
+                               self::$list['Search'] = 'SpecialSearch';
                        }
  
                        if ( $wgEmailAuthentication ) {
-                               self::$mList['Confirmemail'] = 'EmailConfirmation';
-                               self::$mList['Invalidateemail'] = 'EmailInvalidation';
+                               self::$list['Confirmemail'] = 'EmailConfirmation';
+                               self::$list['Invalidateemail'] = 'EmailInvalidation';
                        }
  
                        if ( $wgEnableEmail ) {
-                               self::$mList['ChangeEmail'] = 'SpecialChangeEmail';
+                               self::$list['ChangeEmail'] = 'SpecialChangeEmail';
                        }
  
                        if ( $wgEnableJavaScriptTest ) {
-                               self::$mList['JavaScriptTest'] = 'SpecialJavaScriptTest';
+                               self::$list['JavaScriptTest'] = 'SpecialJavaScriptTest';
                        }
  
                        // Add extension special pages
-                       self::$mList = array_merge( self::$mList, $wgSpecialPages );
+                       self::$list = array_merge( self::$list, $wgSpecialPages );
  
                        // Run hooks
                        // This hook can be used to remove undesired built-in special pages
-                       wfRunHooks( 'SpecialPage_initList', array( &self::$mList ) );
+                       wfRunHooks( 'SpecialPage_initList', array( &self::$list ) );
  
                        // Cast to object: func()[$key] doesn't work, but func()->$key does
-                       settype( self::$mList, 'object' );
+                       settype( self::$list, 'object' );
  
                        wfProfileOut( __METHOD__ );
                }
-               return self::$mList;
+               return self::$list;
        }
  
        /**
@@@ -231,28 -229,28 +230,28 @@@
         * @return Object
         */
        static function getAliasList() {
-               if ( !is_object( self::$mAliases ) ) {
+               if ( !is_object( self::$aliases ) ) {
                        global $wgContLang;
                        $aliases = $wgContLang->getSpecialPageAliases();
  
                        // Objects are passed by reference by default, need to create a copy
                        $missingPages = clone self::getList();
  
-                       self::$mAliases = array();
+                       self::$aliases = array();
                        foreach ( $aliases as $realName => $aliasList ) {
                                foreach ( $aliasList as $alias ) {
-                                       self::$mAliases[$wgContLang->caseFold( $alias )] = $realName;
+                                       self::$aliases[$wgContLang->caseFold( $alias )] = $realName;
                                }
                                unset( $missingPages->$realName );
                        }
                        foreach ( $missingPages as $name => $stuff ) {
-                               self::$mAliases[$wgContLang->caseFold( $name )] = $name;
+                               self::$aliases[$wgContLang->caseFold( $name )] = $name;
                        }
  
                        // Cast to object: func()[$key] doesn't work, but func()->$key does
-                       self::$mAliases = (object)self::$mAliases;
+                       self::$aliases = (object)self::$aliases;
                }
-               return self::$mAliases;
+               return self::$aliases;
        }
  
        /**