From 898f6a75157500f98b344d062b16c62d6978ff34 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 18 Dec 2007 20:58:37 +0000
Subject: [PATCH] * (bug 12296) Simplify cache epoch in default
 LocalSettings.php

---
 RELEASE-NOTES    | 2 ++
 config/index.php | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dcbbb9f199..bc55264c7d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -250,6 +250,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12031) All namespaces doesn't work in Special:Newpages
 * (bug 585) Only create searchindex replica table for parser tests if db is MySQL
 * Allow --record option if parserTests.php to work when using Postgres
+* (bug 12296) Simplify cache epoch in default LocalSettings.php
+
 
 == Parser changes in 1.12 ==
 
diff --git a/config/index.php b/config/index.php
index 25e4788e69..c24b963d36 100644
--- a/config/index.php
+++ b/config/index.php
@@ -1672,8 +1672,7 @@ if ( \$wgCommandLineMode ) {
 
 # When you make changes to this configuration file, this will make
 # sure that cached pages are cleared.
-\$configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) );
-\$wgCacheEpoch = max( \$wgCacheEpoch, \$configdate );
+\$wgCacheEpoch = max( \$wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) );
 	"; ## End of setting the $localsettings string
 
 	// Keep things in Unix line endings internally;
-- 
2.20.1