X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderModule.php;h=a7fee8546b0b66f87b8bf7a3427a7562a718ce7e;hb=4821c63624e123043bddc54293cf6a286505955e;hp=0baed65fce0e2e920162881dcb5325f54a650990;hpb=2bb86d3c9c4fa6fa4cfbb464b2c2ceebf4ea0eb8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index 0baed65fce..a7fee8546b 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -409,7 +409,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 	 * @return array List of files
 	 */
 	protected function getFileDependencies( ResourceLoaderContext $context ) {
-		$vary = $context->getSkin() . '|' . $context->getLanguage();
+		$vary = self::getVary( $context );
 
 		// Try in-object cache first
 		if ( !isset( $this->fileDeps[$vary] ) ) {
@@ -444,7 +444,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 	 * @param string[] $files Array of file names
 	 */
 	public function setFileDependencies( ResourceLoaderContext $context, $files ) {
-		$vary = $context->getSkin() . '|' . $context->getLanguage();
+		$vary = self::getVary( $context );
 		$this->fileDeps[$vary] = $files;
 	}
 
@@ -481,7 +481,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 			}
 
 			// The file deps list has changed, we want to update it.
-			$vary = $context->getSkin() . '|' . $context->getLanguage();
+			$vary = self::getVary( $context );
 			$cache = ObjectCache::getLocalClusterInstance();
 			$key = $cache->makeKey( __METHOD__, $this->getName(), $vary );
 			$scopeLock = $cache->getScopedLock( $key, 0 );
@@ -1017,4 +1017,18 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 	protected static function safeFileHash( $filePath ) {
 		return FileContentsHasher::getFileContentsHash( $filePath );
 	}
+
+	/**
+	 * Get vary string.
+	 *
+	 * @internal For internal use only.
+	 * @param ResourceLoaderContext $context
+	 * @return string Vary string
+	 */
+	public static function getVary( ResourceLoaderContext $context ) {
+		return implode( '|', [
+			$context->getSkin(),
+			$context->getLanguage(),
+		] );
+	}
 }