From 77bac0d25e0ff6fcfa3c15ba712440ec29f86ede Mon Sep 17 00:00:00 2001 From: Andrew Garrett Date: Tue, 9 Jun 2009 17:32:33 +0000 Subject: [PATCH] Fix default check for preferences --- includes/Preferences.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 -- 2.20.1