From f1d969efdb0989fc5d82780b9babdca70e3b4235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <niklas.laxstrom@gmail.com>
Date: Fri, 19 Sep 2014 12:11:43 +0200
Subject: [PATCH] Remove workaround code only needed for MW 1.20 and lower

Change-Id: Ifc256ccc144fab2a359dcd9ef0ae7be6751a471c
---
 UniversalLanguageSelector.hooks.php | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index 36c292b6..7baf7663 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -187,31 +187,17 @@ class UniversalLanguageSelectorHooks {
 	 * Hook to UserGetLanguageObject
 	 * @param User $user
 	 * @param string $code
-	 * @param RequestContext $context Optional RequestContext
+	 * @param RequestContext $context
 	 * @return bool
 	 */
-	public static function getLanguage( $user, &$code, $context = null ) {
+	public static function getLanguage( User $user, &$code, RequestContext $context ) {
 		global $wgULSAnonCanChangeLanguage, $wgULSLanguageDetection;
 
 		if ( !self::isToolbarEnabled( $user ) ) {
 			return true;
 		}
 
-		/* Before $request is passed to this, check if the given user
-		 * name matches the current user name to detect if we are not
-		 * running in the primary request context. See bug 44010 */
-		if ( !$context instanceof RequestContext ) {
-			global $wgUser, $wgRequest;
-
-			if ( $wgUser->getName() !== $user->getName() ) {
-				return true;
-			}
-
-			// Should be safe to use the global request now
-			$request = $wgRequest;
-		} else {
-			$request = $context->getRequest();
-		}
+		$request = $context->getRequest();
 
 		$languageToSave = $request->getVal( 'setlang' );
 		if ( $request->getVal( 'uselang' ) && !$languageToSave ) {