From c08e097fe417b1c56218122e67d1493096a56f6c Mon Sep 17 00:00:00 2001 From: Alex Monk Date: Wed, 12 Aug 2015 23:13:13 +0100 Subject: [PATCH] Preferences: Don't load all default options for every default preference Change-Id: Iaaebea56674dfaa48dbfedf6c7e5ad9eaa05759e --- includes/Preferences.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Preferences.php b/includes/Preferences.php index 9497ee78aa..cd675c6fc8 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -124,6 +124,7 @@ class Preferences { $disable = !$user->isAllowed( 'editmyoptions' ); + $defaultOptions = User::getDefaultOptions(); ## Prod in defaults from the user foreach ( $defaultPreferences as $name => &$info ) { $prefFromUser = self::getOptionFromUser( $name, $info, $user ); @@ -131,7 +132,6 @@ class Preferences { $info['disabled'] = 'disabled'; } $field = HTMLForm::loadInputFromParameters( $name, $info, $dummyForm ); // For validation - $defaultOptions = User::getDefaultOptions(); $globalDefault = isset( $defaultOptions[$name] ) ? $defaultOptions[$name] : null; -- 2.20.1