From b2ff1cb8cee5214793e5a7f7d88a0688cac2e217 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 29 Sep 2012 00:59:53 -0700
Subject: [PATCH] Small tweaks.

* Assign $languageToSave earlier; more efficient.
* Double quotes to single quotes.
* Whitespace update.

Change-Id: I7028ac3ce5cbbe3611f33290331d0a014a073bf5
---
 UniversalLanguageSelector.hooks.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index f1ad9e83..01b853c6 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -19,7 +19,6 @@
  */
 
 class UniversalLanguageSelectorHooks {
-
 	/**
 	 * BeforePageDisplay hook handler.
 	 * @param $out OutputPage
@@ -106,7 +105,7 @@ class UniversalLanguageSelectorHooks {
 		}
 
 		wfProfileOut( __METHOD__ );
-		return "";
+		return '';
 	}
 
 	/**
@@ -117,14 +116,15 @@ class UniversalLanguageSelectorHooks {
 	 */
 	public static function getLanguage( $user, &$code ) {
 		global $wgRequest, $wgULSLanguageDetection;
-		if ( $wgRequest->getVal( 'uselang' ) && !$wgRequest->getVal( 'setlang' ) ) {
+
+		$languageToSave = $wgRequest->getVal( 'setlang' );
+		if ( $wgRequest->getVal( 'uselang' ) && !$languageToSave ) {
 			// uselang can be used for temporary override of language preference
 			// when setlang is not provided
 			return true;
 		}
 
 		$languageToUse = null;
-		$languageToSave = $wgRequest->getVal( 'setlang' );
 		if ( self::isSupportedLanguage( $languageToSave ) ) {
 			if ( $user->isAnon() ) {
 				$wgRequest->response()->setcookie( 'language', $languageToSave );