From d411e0b1e0a23dc54e1d39573e5ee4b9f3019141 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 11 Oct 2006 08:25:26 +0000
Subject: [PATCH] Renamed CacheManager to HTMLFileCache, to avoid confusion
 with the other sort of cache.

---
 includes/Article.php                             | 8 ++++----
 includes/AutoLoader.php                          | 2 +-
 includes/Database.php                            | 2 +-
 includes/HTMLCacheUpdate.php                     | 2 +-
 includes/{CacheManager.php => HTMLFileCache.php} | 6 +++---
 includes/Title.php                               | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename includes/{CacheManager.php => HTMLFileCache.php} (97%)

diff --git a/includes/Article.php b/includes/Article.php
index 8c07b06c51..8bd114ee68 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -9,7 +9,7 @@
  *
  * See design.txt for an overview.
  * Note: edit user interface and cache support functions have been
- * moved to separate EditPage and CacheManager classes.
+ * moved to separate EditPage and HTMLFileCache classes.
  *
  * @package MediaWiki
  */
@@ -2250,7 +2250,7 @@ class Article {
 		$called = true;
 		if($this->isFileCacheable()) {
 			$touched = $this->mTouched;
-			$cache = new CacheManager( $this->mTitle );
+			$cache = new HTMLFileCache( $this->mTitle );
 			if($cache->isFileCacheGood( $touched )) {
 				wfDebug( "Article::tryFileCache(): about to load file\n" );
 				$cache->loadFromFileCache();
@@ -2438,7 +2438,7 @@ class Article {
 		
 		# File cache
 		if ( $wgUseFileCache ) {
-			$cm = new CacheManager( $title );
+			$cm = new HTMLFileCache( $title );
 			@unlink( $cm->fileCacheName() );
 		}
 
@@ -2464,7 +2464,7 @@ class Article {
 
 		# Clear file cache
 		if ( $wgUseFileCache ) {
-			$cm = new CacheManager( $title );
+			$cm = new HTMLFileCache( $title );
 			@unlink( $cm->fileCacheName() );
 		}
 	}
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 810a448ea8..fb8a394f78 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -22,7 +22,7 @@ function __autoload($className) {
 		'eAccelBagOStuff' => 'includes/BagOStuff.php',
 		'DBABagOStuff' => 'includes/BagOStuff.php',
 		'Block' => 'includes/Block.php',
-		'CacheManager' => 'includes/CacheManager.php',
+		'HTMLFileCache' => 'includes/HTMLFileCache.php',
 		'CategoryPage' => 'includes/CategoryPage.php',
 		'CategoryViewer' => 'includes/CategoryPage.php',
 		'Categoryfinder' => 'includes/Categoryfinder.php',
diff --git a/includes/Database.php b/includes/Database.php
index 53e5996872..9225d94ff9 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -152,7 +152,7 @@ border=\"0\" ALT=\"Google\"></A>
 				}
 			}
 
-			$cache = new CacheManager( $t );
+			$cache = new HTMLFileCache( $t );
 			if( $cache->isFileCached() ) {
 				$msg = '<p style="color: red"><b>'.$msg."<br />\n" .
 					$cachederror . "</b></p>\n";
diff --git a/includes/HTMLCacheUpdate.php b/includes/HTMLCacheUpdate.php
index 47703b2005..f76bcd6874 100644
--- a/includes/HTMLCacheUpdate.php
+++ b/includes/HTMLCacheUpdate.php
@@ -176,7 +176,7 @@ class HTMLCacheUpdate
 				# Update file cache
 				if  ( $wgUseFileCache ) {
 					foreach ( $titles as $title ) {
-						$cm = new CacheManager($title);
+						$cm = new HTMLFileCache($title);
 						@unlink($cm->fileCacheName());
 					}
 				}
diff --git a/includes/CacheManager.php b/includes/HTMLFileCache.php
similarity index 97%
rename from includes/CacheManager.php
rename to includes/HTMLFileCache.php
index b9e307f44f..d85a441106 100644
--- a/includes/CacheManager.php
+++ b/includes/HTMLFileCache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Contain the CacheManager class
+ * Contain the HTMLFileCache class
  * @package MediaWiki
  * @subpackage Cache
  */
@@ -18,10 +18,10 @@
  * $wgUseGzip
  * @package MediaWiki
  */
-class CacheManager {
+class HTMLFileCache {
 	var $mTitle, $mFileCache;
 
-	function CacheManager( &$title ) {
+	function HTMLFileCache( &$title ) {
 		$this->mTitle =& $title;
 		$this->mFileCache = '';
 	}
diff --git a/includes/Title.php b/includes/Title.php
index 0e86063ee4..e8ce66930c 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -540,7 +540,7 @@ class Title {
 
 		foreach ( $titles as $title ) {
 			if ( $wgUseFileCache ) {
-				$cm = new CacheManager($title);
+				$cm = new HTMLFileCache($title);
 				@unlink($cm->fileCacheName());
 			}
 
@@ -1366,7 +1366,7 @@ class Title {
 		);
 
 		if ($wgUseFileCache) {
-			$cache = new CacheManager($this);
+			$cache = new HTMLFileCache($this);
 			@unlink($cache->fileCacheName());
 		}
 
-- 
2.20.1