From 119ee2a87271716238c8ca61e800442f873a6af0 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 3 Oct 2011 06:54:39 +0000
Subject: [PATCH] Simplified cacheDirectory() in FileCacheBase and
 HTMLFileCache. It turns out $wgFileCacheDirectory is always set in setup.php
 already.

---
 includes/cache/FileCacheBase.php | 11 ++---------
 includes/cache/HTMLFileCache.php | 11 +----------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/includes/cache/FileCacheBase.php b/includes/cache/FileCacheBase.php
index e6be049335..3ad9b7c866 100644
--- a/includes/cache/FileCacheBase.php
+++ b/includes/cache/FileCacheBase.php
@@ -28,15 +28,8 @@ abstract class FileCacheBase {
 	 * @return string
 	 */
 	final protected function baseCacheDirectory() {
-		global $wgCacheDirectory, $wgFileCacheDirectory, $wgFileCacheDepth;
-		if ( $wgFileCacheDirectory ) {
-			$dir = $wgFileCacheDirectory;
-		} elseif ( $wgCacheDirectory ) {
-			$dir = $wgCacheDirectory;
-		} else {
-			throw new MWException( 'Please set $wgCacheDirectory in LocalSettings.php if you wish to use the HTML file cache' );
-		}
-		return $dir;
+		global $wgFileCacheDirectory;
+		return $wgFileCacheDirectory;
 	}
 
 	/**
diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 532850a596..c0c4a577f8 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -35,19 +35,10 @@ class HTMLFileCache extends FileCacheBase {
 
 	/**
 	 * Get the base file cache directory
-	 * Note: avoids baseCacheDirectory() for b/c to not skip existing cache
 	 * @return string
 	 */
 	protected function cacheDirectory() {
-		global $wgCacheDirectory, $wgFileCacheDirectory, $wgFileCacheDepth;
-		if ( $wgFileCacheDirectory ) {
-			$dir = $wgFileCacheDirectory;
-		} elseif ( $wgCacheDirectory ) {
-			$dir = "$wgCacheDirectory/html";
-		} else {
-			throw new MWException( 'Please set $wgCacheDirectory in LocalSettings.php if you wish to use the HTML file cache' );
-		}
-		return $dir;
+		return $this->baseCacheDirectory(); // no subdir for b/c with old cache files
 	}
 
 	/**
-- 
2.20.1