From: Antoine Musso <hashar@free.fr>
Date: Thu, 23 May 2013 14:17:15 +0000 (+0200)
Subject: User::getDefaultOptions duplicate call
X-Git-Tag: 1.31.0-rc.0~19600
X-Git-Url: http://git.cyclocoop.org//%22%22.url_de_base%28%29.%22/%22?a=commitdiff_plain;h=95712b4a5cde2486274866b02d3a5ed35e31aeee;p=lhc%2Fweb%2Fwiklou.git

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
---

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] );
 		}