http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98741
Revision: 98741
Author: aaron
Date: 2011-10-03 06:54:39 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Simplified cacheDirectory() in FileCacheBase and HTMLFileCache. It turns out
$wgFileCacheDirectory is always set in setup.php already.
Modified Paths:
--------------
trunk/phase3/includes/cache/FileCacheBase.php
trunk/phase3/includes/cache/HTMLFileCache.php
Modified: trunk/phase3/includes/cache/FileCacheBase.php
===================================================================
--- trunk/phase3/includes/cache/FileCacheBase.php 2011-10-03 06:11:27 UTC
(rev 98740)
+++ trunk/phase3/includes/cache/FileCacheBase.php 2011-10-03 06:54:39 UTC
(rev 98741)
@@ -28,15 +28,8 @@
* @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;
}
/**
Modified: trunk/phase3/includes/cache/HTMLFileCache.php
===================================================================
--- trunk/phase3/includes/cache/HTMLFileCache.php 2011-10-03 06:11:27 UTC
(rev 98740)
+++ trunk/phase3/includes/cache/HTMLFileCache.php 2011-10-03 06:54:39 UTC
(rev 98741)
@@ -35,19 +35,10 @@
/**
* 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
}
/**
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
