From a2bf2346cdaa4b4dce7b005f20220c3ceb56f6bb Mon Sep 17 00:00:00 2001
From: Ori Livneh <ori@wikimedia.org>
Date: Fri, 18 Apr 2014 12:11:42 -0700
Subject: [PATCH] Don't cache $wgResourceLoaderLESSVars in a static

Caching the value of $wgResourceLoaderLESSVars in a static variable that is
enclosed in a closure makes it harder to reset global state for test runs, and
it does so in the name of a performance benefit that is miniscule.

Change-Id: I0958b03818f56ab73c8c9124daa9e54cc59f2428
---
 includes/resourceloader/ResourceLoader.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index eac6a02f63..6b8c7c4faa 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1319,12 +1319,9 @@ class ResourceLoader {
 	public static function getLESSVars() {
 		global $wgResourceLoaderLESSVars;
 
-		static $lessVars = null;
-		if ( $lessVars === null ) {
-			$lessVars = $wgResourceLoaderLESSVars;
-			// Sort by key to ensure consistent hashing for cache lookups.
-			ksort( $lessVars );
-		}
+		$lessVars = $wgResourceLoaderLESSVars;
+		// Sort by key to ensure consistent hashing for cache lookups.
+		ksort( $lessVars );
 		return $lessVars;
 	}
 }
-- 
2.20.1