From 9f81e60c649279cd133b4d55a8ba71b08899bcea Mon Sep 17 00:00:00 2001
From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Sun, 3 Apr 2011 23:56:15 +0000
Subject: [PATCH] Followup r85278, remove duplication of userlang code.

---
 includes/StubObject.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/includes/StubObject.php b/includes/StubObject.php
index d1055e10f5..1c5460b986 100644
--- 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;
 	}
 }
-- 
2.20.1