X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fcache%2FResourceFileCache.php;h=e1186efd73590b8154701befbf2d704fd66a6366;hb=058d03327886a5bc07bb5a6f53d69d9caa208069;hp=55da52c5c08a4b4e140f8b2c4bd934efd1d7d364;hpb=ca895b7072b9d98a5b3abf8f2a46474095c16210;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/cache/ResourceFileCache.php b/includes/cache/ResourceFileCache.php
index 55da52c5c0..e1186efd73 100644
--- a/includes/cache/ResourceFileCache.php
+++ b/includes/cache/ResourceFileCache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Resource loader request result caching in the file system.
+ * ResourceLoader request result caching in the file system.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
  */
 
 /**
- * Resource loader request result caching in the file system.
+ * ResourceLoader request result caching in the file system.
  *
  * @ingroup Cache
  */
@@ -40,7 +40,9 @@ class ResourceFileCache extends FileCacheBase {
 	public static function newFromContext( ResourceLoaderContext $context ) {
 		$cache = new self();
 
-		if ( $context->getOnly() === 'styles' ) {
+		if ( $context->getImage() ) {
+			$cache->mType = 'image';
+		} elseif ( $context->getOnly() === 'styles' ) {
 			$cache->mType = 'css';
 		} else {
 			$cache->mType = 'js';
@@ -69,7 +71,8 @@ class ResourceFileCache extends FileCacheBase {
 		// Get all query values
 		$queryVals = $context->getRequest()->getValues();
 		foreach ( $queryVals as $query => $val ) {
-			if ( $query === 'modules' || $query === 'version' || $query === '*' ) {
+			if ( in_array( $query, array( 'modules', 'image', 'variant', 'version', '*' ) ) ) {
+				// Use file cache regardless of the value of this parameter
 				continue; // note: &* added as IE fix
 			} elseif ( $query === 'skin' && $val === $wgDefaultSkin ) {
 				continue;
@@ -79,6 +82,8 @@ class ResourceFileCache extends FileCacheBase {
 				continue;
 			} elseif ( $query === 'debug' && $val === 'false' ) {
 				continue;
+			} elseif ( $query === 'format' && $val === 'rasterized' ) {
+				continue;
 			}
 
 			return false;