From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Mon, 13 Nov 2017 16:42:04 +0000 (+0100)
Subject: Preferences: Remove unwise caching of Preferences::getPreferences()
X-Git-Tag: 1.31.0-rc.0~1490^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=eed3cf7747dd9d183b62f2550c741584093e6373;p=lhc%2Fweb%2Fwiklou.git

Preferences: Remove unwise caching of Preferences::getPreferences()

The result of this function depends on the $user and $context
parameters (e.g. it includes the username from the user, and
localisation messages the language from the context). However,
both of them would be ignored if the result was cached, even
if calling with a different $user or $context.

Rather than make this more complicated just remove the caching.
This is not a hot code path: this function is not called at all
on normal page views, it's called just once when viewing
preferences, and at most twice when saving them.

Change-Id: I92390120a16448383a25e9ba2dd35a434a2f21bf
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 738f8eecff..e383f03f6b 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -47,9 +47,6 @@ use MediaWiki\MediaWikiServices;
  * over to the tryUISubmit static method of this class.
  */
 class Preferences {
-	/** @var array */
-	protected static $defaultPreferences = null;
-
 	/** @var array */
 	protected static $saveFilters = [
 		'timecorrection' => [ 'Preferences', 'filterTimezoneInput' ],
@@ -78,10 +75,6 @@ class Preferences {
 	 * @return array|null
 	 */
 	static function getPreferences( $user, IContextSource $context ) {
-		if ( self::$defaultPreferences ) {
-			return self::$defaultPreferences;
-		}
-
 		OutputPage::setupOOUI(
 			strtolower( $context->getSkin()->getSkinName() ),
 			$context->getLanguage()->getDir()
@@ -103,7 +96,6 @@ class Preferences {
 		Hooks::run( 'GetPreferences', [ $user, &$defaultPreferences ] );
 
 		self::loadPreferenceValues( $user, $context, $defaultPreferences );
-		self::$defaultPreferences = $defaultPreferences;
 		return $defaultPreferences;
 	}
 
diff --git a/tests/phpunit/includes/PreferencesTest.php b/tests/phpunit/includes/PreferencesTest.php
index b25e046d42..4a152253db 100644
--- a/tests/phpunit/includes/PreferencesTest.php
+++ b/tests/phpunit/includes/PreferencesTest.php
@@ -150,20 +150,9 @@ class PreferencesTest extends MediaWikiTestCase {
 
 	/** Helper */
 	protected function prefsFor( $user_key ) {
-		// TODO This should use Preferences::getPreferences() instead of calling internal methods.
-		// Unfortunately that currently ignores the $user parameter if it has cached data, even for
-		// a different user...
-		OutputPage::setupOOUI(
-			strtolower( $this->context->getSkin()->getSkinName() ),
-			$this->context->getLanguage()->getDir()
-		);
-		$preferences = [];
-		Preferences::profilePreferences(
+		return Preferences::getPreferences(
 			$this->prefUsers[$user_key],
-			$this->context,
-			$preferences
+			$this->context
 		);
-
-		return $preferences;
 	}
 }