From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Tue, 9 Jun 2009 17:32:33 +0000 (+0000)
Subject: Fix default check for preferences
X-Git-Tag: 1.31.0-rc.0~41432
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=77bac0d25e0ff6fcfa3c15ba712440ec29f86ede;p=lhc%2Fweb%2Fwiklou.git

Fix default check for preferences
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index f54cf05e94..953f71d13e 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -42,8 +42,9 @@ class Preferences {
 		foreach( $defaultPreferences as $name => &$info ) {
 			$prefFromUser = self::getOptionFromUser( $name, $info, $user );
 			$field = HTMLForm::loadInputFromParameters( $info ); // For validation
-			$globalDefault = isset($wgDefaultUserOptions[$name])
-								? $wgDefaultUserOptions[$name]
+			$defaultOptions = User::getDefaultOptions();
+			$globalDefault = isset($defaultOptions[$name])
+								? $defaultOptions[$name]
 								: null;
 			
 			// If it validates, set it as the default