From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 4 Nov 2015 01:19:57 +0000 (+0000)
Subject: Merge "resourceloader: Use WAN cache for validateScriptFile cache"
X-Git-Tag: 1.31.0-rc.0~9110
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=70fcdfe0f436f19de4cb6e0ccb5990d44f43c100;hp=6da45bcaefda29dc942e0805ff17e2e552797c8e;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Use WAN cache for validateScriptFile cache"
---

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index 63ba5c1cef..fcda87b9b2 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -844,7 +844,7 @@ abstract class ResourceLoaderModule {
 	protected function validateScriptFile( $fileName, $contents ) {
 		if ( $this->getConfig()->get( 'ResourceLoaderValidateJS' ) ) {
 			// Try for cache hit
-			$cache = ObjectCache::getLocalClusterInstance();
+			$cache = ObjectCache::getMainWANInstance();
 			$key = $cache->makeKey(
 				'resourceloader',
 				'jsparse',