* (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 23df147..f89cc3c 100644 (file)
--- 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 4611042..53af1e6 100644 (file)
--- 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;