From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- includes/cache/ResourceFileCache.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'includes/cache/ResourceFileCache.php') diff --git a/includes/cache/ResourceFileCache.php b/includes/cache/ResourceFileCache.php index 2ad7b853..55da52c5 100644 --- a/includes/cache/ResourceFileCache.php +++ b/includes/cache/ResourceFileCache.php @@ -34,7 +34,7 @@ class ResourceFileCache extends FileCacheBase { /** * Construct an ResourceFileCache from a context - * @param $context ResourceLoaderContext + * @param ResourceLoaderContext $context * @return ResourceFileCache */ public static function newFromContext( ResourceLoaderContext $context ) { @@ -58,7 +58,7 @@ class ResourceFileCache extends FileCacheBase { /** * Check if an RL request can be cached. * Caller is responsible for checking if any modules are private. - * @param $context ResourceLoaderContext + * @param ResourceLoaderContext $context * @return bool */ public static function useFileCache( ResourceLoaderContext $context ) { @@ -80,8 +80,10 @@ class ResourceFileCache extends FileCacheBase { } elseif ( $query === 'debug' && $val === 'false' ) { continue; } + return false; } + return true; // cacheable } @@ -104,6 +106,7 @@ class ResourceFileCache extends FileCacheBase { $this->getMissesRecent() >= self::MISS_THRESHOLD // many misses ); } + return $this->mCacheWorthy; } } -- cgit v1.2.2