Get rid of StubUser. Constructing a user object isn't quite as intensive as it once...

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 52b6bd5..a42398a 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -214,7 +214,6 @@ $wgAutoloadLocalClasses = array(
        'SquidPurgeClientPool' => 'includes/SquidPurgeClient.php',
        'Status' => 'includes/Status.php',
        'StubContLang' => 'includes/StubObject.php',
-       'StubUser' => 'includes/StubObject.php',
        'StubUserLang' => 'includes/StubObject.php',
        'StubObject' => 'includes/StubObject.php',
        'StringUtils' => 'includes/StringUtils.php',

diff --git a/includes/Setup.php b/includes/Setup.php
index d9777e2..fa3296d 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -322,8 +322,7 @@ $wgContLang = new StubContLang;
 
 // Now that variant lists may be available...
 $wgRequest->interpolateTitle();
-
-$wgUser = new StubUser;
+$wgUser = $wgCommandLineMode ? new User : User::newFromSession();
 $wgLang = new StubUserLang;
 $wgOut = new StubObject( 'wgOut', 'OutputPage' );
 $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );

diff --git a/includes/StubObject.php b/includes/StubObject.php
index c93e3fc..fe28f91 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -165,30 +165,3 @@ class StubUserLang extends StubObject {
                }
        }
 }
-
-/**
- * Stub object for the user. The initialisation of the will depend of
- * $wgCommandLineMode. If it's true, it will be an anonymous user and if it's
- * false, the user will be loaded from credidentails provided by cookies. This
- * object have to be in $wgUser global.
- */
-class StubUser extends StubObject {
-
-       function __construct() {
-               parent::__construct( 'wgUser' );
-       }
-
-       function __call( $name, $args ) {
-               return $this->_call( $name, $args );
-       }
-
-       function _newObject() {
-               global $wgCommandLineMode;
-               if( $wgCommandLineMode ) {
-                       $user = new User;
-               } else {
-                       $user = User::newFromSession();
-               }
-               return $user;
-       }
-}