(see bug 29712) Removing the defaultUserOptionOverrides in MessagesXx.php because...

[lhc/web/wiklou.git] / includes / User.php

diff --git a/includes/User.php b/includes/User.php
index 422a7cc..8019079 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1184,16 +1184,10 @@ class User {
         * @return Array of String options
         */
        static function getDefaultOptions() {
-               global $wgNamespacesToBeSearchedDefault;
-               /**
-                * Site defaults will override the global/language defaults
-                */
-               global $wgDefaultUserOptions, $wgContLang, $wgDefaultSkin;
-               $defOpt = $wgDefaultUserOptions + $wgContLang->getDefaultUserOptionOverrides();
-
-               /**
-                * default language setting
-                */
+               global $wgNamespacesToBeSearchedDefault, $wgDefaultUserOptions, $wgContLang, $wgDefaultSkin;
+
+               $defOpt = $wgDefaultUserOptions;
+               # default language setting
                $variant = $wgContLang->getDefaultVariant();
                $defOpt['variant'] = $variant;
                $defOpt['language'] = $variant;