From: jdlrobson <jdlrobson@gmail.com>
Date: Mon, 16 Jun 2014 17:26:15 +0000 (-0700)
Subject: Refactor Preferences code to allow better reuse.
X-Git-Tag: 1.31.0-rc.0~15022^2
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=a8871cff145e6985ffb2666f2c6f7f8733ba86c5;p=lhc%2Fweb%2Fwiklou.git

Refactor Preferences code to allow better reuse.

Break up getPreferences into smaller subfunctions to
allow for reuse.

Change-Id: Idd33bab61b3ef5a262fee9361105f1c5d8024044
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index f884ec3a85..fdb1a9db66 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -98,6 +98,20 @@ class Preferences {
 
 		wfRunHooks( 'GetPreferences', array( $user, &$defaultPreferences ) );
 
+		self::loadPreferenceValues( $user, $context, $defaultPreferences );
+		self::$defaultPreferences = $defaultPreferences;
+		return $defaultPreferences;
+	}
+
+	/**
+	 * Loads existing values for a given array of preferences
+	 * @throws MWException
+	 * @param User $user
+	 * @param IContextSource $context
+	 * @param array defaultPreferences to load values for
+	 * @return array|null
+	 */
+	static function loadPreferenceValues( $user, $context, &$defaultPreferences ) {
 		## Remove preferences that wikis don't want to use
 		global $wgHiddenPrefs;
 		foreach ( $wgHiddenPrefs as $pref ) {
@@ -138,8 +152,6 @@ class Preferences {
 			}
 		}
 
-		self::$defaultPreferences = $defaultPreferences;
-
 		return $defaultPreferences;
 	}