From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 21 Oct 2009 11:42:10 +0000 (+0000)
Subject: * (bug 21161) Changing $wgCaCacheEpoch now always invalidates file cache
X-Git-Tag: 1.31.0-rc.0~39201
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=fd5b9ebd87c5fe61b93f88125c7708732283b63c;p=lhc%2Fweb%2Fwiklou.git

* (bug 21161) Changing $wgCaCacheEpoch now always invalidates file cache

Based on a patch by Platonides - http://bug-attachment.wikimedia.org/attachment.cgi?id=6678
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 23df147fe6..f89cc3ce60 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -579,6 +579,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 20911) Installer failed to create a SQLite database
 * (bug 20847) Deprecated deprecated akeytt() removed in wikibits.js leaving
   dummy
+* (bug 21161) Changing $wgCaCacheEpoch now always invalidates file cache
 
 == API changes in 1.16 ==
 
diff --git a/includes/HTMLFileCache.php b/includes/HTMLFileCache.php
index 4611042901..53af1e6e12 100644
--- a/includes/HTMLFileCache.php
+++ b/includes/HTMLFileCache.php
@@ -106,7 +106,6 @@ class HTMLFileCache {
 		global $wgCacheEpoch;
 
 		if( !$this->isFileCached() ) return false;
-		if( !$timestamp ) return true; // should be invalidated on change
 
 		$cachetime = $this->fileCacheTime();
 		$good = $timestamp <= $cachetime && $wgCacheEpoch <= $cachetime;