Fixes IE bug that causes lists in panel to show bullets.

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

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 0cd453b..e18537e 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -2,17 +2,17 @@
 
 /**
  * Class to implement stub globals, which are globals that delay loading the
- * their associated module code by deferring initialisation until the first 
- * method call. 
+ * their associated module code by deferring initialisation until the first
+ * method call.
  *
- * Note on unstub loops: 
+ * Note on unstub loops:
  *
- * Unstub loops (infinite recursion) sometimes occur when a constructor calls 
- * another function, and the other function calls some method of the stub. The 
+ * Unstub loops (infinite recursion) sometimes occur when a constructor calls
+ * another function, and the other function calls some method of the stub. The
  * best way to avoid this is to make constructors as lightweight as possible,
- * deferring any initialisation which depends on other modules. As a last 
- * resort, you can use StubObject::isRealObject() to break the loop, but as a 
- * general rule, the stub object mechanism should be transparent, and code 
+ * deferring any initialisation which depends on other modules. As a last
+ * resort, you can use StubObject::isRealObject() to break the loop, but as a
+ * general rule, the stub object mechanism should be transparent, and code
  * which refers to it should be kept to a minimum.
  */
 class StubObject {
@@ -79,7 +79,7 @@ class StubObject {
        /**
         * This function creates a new object of the real class and replace it in
         * the global variable.
-        * This is public, for the convenience of external callers wishing to access 
+        * This is public, for the convenience of external callers wishing to access
         * properties, e.g. eval.php
         *
         * @param String $name name of the method called in this object.
@@ -95,7 +95,7 @@ class StubObject {
                        if ( ++$recursionLevel > 2 ) {
                                throw new MWException( "Unstub loop detected on call of \${$this->mGlobal}->$name from $caller\n" );
                        }
-                       wfDebug( "Unstubbing \${$this->mGlobal} on call of \${$this->mGlobal}->$name from $caller\n" );
+                       wfDebug( "Unstubbing \${$this->mGlobal} on call of \${$this->mGlobal}::$name from $caller\n" );
                        $GLOBALS[$this->mGlobal] = $this->_newObject();
                        --$recursionLevel;
                        wfProfileOut( $fname );
@@ -145,17 +145,56 @@ class StubUserLang extends StubObject {
                global $wgContLanguageCode, $wgRequest, $wgUser, $wgContLang;
                $code = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
 
+               # Validate $code
+               if( empty( $code ) || !preg_match( '/^[a-z-]+$/', $code ) || ( $code === 'qqq' ) ) {
+                       wfDebug( "Invalid user language code\n" );
+                       $code = $wgContLanguageCode;
+               }
+
+               if( $code === $wgContLanguageCode ) {
+                       return $wgContLang;
+               } else {
+                       $obj = Language::factory( $code );
+                       return $obj;
+               }
+       }
+}
+
+/**
+ * Stub object for the user variant. It depends of the user preferences and
+ * "variant" parameter that can be passed to index.php. This object have to be
+ * in $wgVariant global.
+ */
+class StubUserVariant extends StubObject {
+
+       function __construct() {
+               parent::__construct( 'wgVariant' );
+       }
+
+       function __call( $name, $args ) {
+               return $this->_call( $name, $args );
+       }
+
+       function _newObject() {
+               global $wgContLanguageCode, $wgRequest, $wgUser, $wgContLang;
+
+               if( $wgContLang->hasVariants() ) {
+                       $code = $wgRequest->getVal( 'variant', $wgUser->getOption( 'variant' ) );
+               } else {
+                       $code = $wgRequest->getVal( 'variant', $wgUser->getOption( 'language' ) );
+               }
+
                // if variant is explicitely selected, use it instead the one from wgUser
                // see bug #7605
-               if( $wgContLang->hasVariants() ){
+               if( $wgContLang->hasVariants() && in_array($code, $wgContLang->getVariants()) ){
                        $variant = $wgContLang->getPreferredVariant();
                        if( $variant != $wgContLanguageCode )
                                $code = $variant;
-               }        
+               }
 
                # Validate $code
-               if( empty( $code ) || !preg_match( '/^[a-z-]+$/', $code ) ) {
-                       wfDebug( "Invalid user language code\n" );
+               if( empty( $code ) || !preg_match( '/^[a-z-]+$/', $code ) || ( $code === 'qqq' ) ) {
+                       wfDebug( "Invalid user variant code\n" );
                        $code = $wgContLanguageCode;
                }
 
@@ -183,14 +222,13 @@ class StubUser extends StubObject {
        function __call( $name, $args ) {
                return $this->_call( $name, $args );
        }
-       
+
        function _newObject() {
                global $wgCommandLineMode;
                if( $wgCommandLineMode ) {
                        $user = new User;
                } else {
                        $user = User::newFromSession();
-                       wfRunHooks( 'AutoAuthenticate', array( &$user ) );
                }
                return $user;
        }