User::getDefaultOptions duplicate call
authorAntoine Musso <hashar@free.fr>
Thu, 23 May 2013 14:17:15 +0000 (16:17 +0200)
committerAntoine Musso <hashar@free.fr>
Thu, 23 May 2013 14:17:33 +0000 (16:17 +0200)
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

index e2cbb81..a2d438c 100644 (file)
@@ -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] );
                }