X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderModule.php;h=3dd7a4b0e2998d96c4e6ed804a58ee6794d1e0e2;hb=9435cd81b07f94a8283d23aff8835c9c734f05db;hp=c50e8b26612f6841d6fb168d52b3f85a3eaa341a;hpb=91d69e12e1d2e00953cae3c153e37f3d36e5903c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index c50e8b2661..3dd7a4b0e2 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -67,10 +67,6 @@ abstract class ResourceLoaderModule {
 	// In-object cache for module content
 	protected $contents = array();
 
-	// Whether the position returned by getPosition() is defined in the module configuration
-	// and not a default value
-	protected $isPositionDefined = false;
-
 	/**
 	 * @var Config
 	 */
@@ -291,19 +287,6 @@ abstract class ResourceLoaderModule {
 		return 'bottom';
 	}
 
-	/**
-	 * Whether the position returned by getPosition() is a default value or comes from the module
-	 * definition. This method is meant to be short-lived, and is only useful until classes added
-	 * via addModuleStyles with a default value define an explicit position. See getModuleStyles()
-	 * in OutputPage for the related migration warning.
-	 *
-	 * @return bool
-	 * @since  1.26
-	 */
-	public function isPositionDefault() {
-		return !$this->isPositionDefined;
-	}
-
 	/**
 	 * Whether this module's JS expects to work without the client-side ResourceLoader module.
 	 * Returning true from this function will prevent mw.loader.state() call from being
@@ -874,14 +857,13 @@ abstract class ResourceLoaderModule {
 	protected function validateScriptFile( $fileName, $contents ) {
 		if ( $this->getConfig()->get( 'ResourceLoaderValidateJS' ) ) {
 			// Try for cache hit
-			// Use CACHE_ANYTHING since parsing JS is much slower than a DB query
-			$key = wfMemcKey(
+			$cache = ObjectCache::getLocalClusterInstance();
+			$key = $cache->makeKey(
 				'resourceloader',
 				'jsparse',
 				self::$parseCacheVersion,
 				md5( $contents )
 			);
-			$cache = wfGetCache( CACHE_ANYTHING );
 			$cacheEntry = $cache->get( $key );
 			if ( is_string( $cacheEntry ) ) {
 				return $cacheEntry;