From 95712b4a5cde2486274866b02d3a5ed35e31aeee Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@free.fr>
Date: Thu, 23 May 2013 16:17:15 +0200
Subject: [PATCH] User::getDefaultOptions duplicate call

The User::getDefaultOptions() has to set up the 'language' and 'variant'
language. That was done using two calls of $wgContLang->getCode().

This patch reduce it to one call.

Change-Id: I0a30f2541e35c115d1cda72ce40d5e3dcd405c5b
---
 includes/User.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index e2cbb816f5..a2d438c9e3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1228,8 +1228,7 @@ class User {
 
 		$defOpt = $wgDefaultUserOptions;
 		# default language setting
-		$defOpt['variant'] = $wgContLang->getCode();
-		$defOpt['language'] = $wgContLang->getCode();
+		$defOpt['language'] = $defOpt['variant'] = $wgContLang->getCode();
 		foreach ( SearchEngine::searchableNamespaces() as $nsnum => $nsname ) {
 			$defOpt['searchNs' . $nsnum] = !empty( $wgNamespacesToBeSearchedDefault[$nsnum] );
 		}
-- 
2.20.1