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 );
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() && $code == $wgContLanguageCode ){
+ 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;
}