Followup r85278, remove duplication of userlang code.

diff --git a/includes/StubObject.php b/includes/StubObject.php
index d1055e1..1c5460b 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -146,24 +146,6 @@ class StubUserLang extends StubObject {
        }
 
        function _newObject() {
-               global $wgLanguageCode, $wgRequest, $wgUser, $wgContLang;
-               $code = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
-               // BCP 47 - letter case MUST NOT carry meaning
-               $code = strtolower( $code );
-
-               # Validate $code
-               if( empty( $code ) || !Language::isValidCode( $code ) || ( $code === 'qqq' ) ) {
-                       wfDebug( "Invalid user language code\n" );
-                       $code = $wgLanguageCode;
-               }
-
-               wfRunHooks( 'UserGetLanguageObject', array( $wgUser, &$code ) );
-
-               if( $code === $wgLanguageCode ) {
-                       return $wgContLang;
-               } else {
-                       $obj = Language::factory( $code );
-                       return $obj;
-               }
+               return RequestContext::getMain()->lang;
        }
 }