dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "FauxRequest: Avoid header leak"
[lhc/web/wiklou.git]
/
includes
/
cache
/
ResourceFileCache.php
diff --git
a/includes/cache/ResourceFileCache.php
b/includes/cache/ResourceFileCache.php
index
55da52c
..
e1186ef
100644
(file)
--- a/
includes/cache/ResourceFileCache.php
+++ b/
includes/cache/ResourceFileCache.php
@@
-1,6
+1,6
@@
<?php
/**
<?php
/**
- * Resource
l
oader request result caching in the file system.
+ * Resource
L
oader 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
*
* 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
l
oader request result caching in the file system.
+ * Resource
L
oader request result caching in the file system.
*
* @ingroup Cache
*/
*
* @ingroup Cache
*/
@@
-40,7
+40,9
@@
class ResourceFileCache extends FileCacheBase {
public static function newFromContext( ResourceLoaderContext $context ) {
$cache = new self();
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';
$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 ) {
// 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;
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;
continue;
} elseif ( $query === 'debug' && $val === 'false' ) {
continue;
+ } elseif ( $query === 'format' && $val === 'rasterized' ) {
+ continue;
}
return false;
}
return false;