| Index: trunk/phase3/includes/cache/FileCacheBase.php |
| — | — | @@ -28,15 +28,8 @@ |
| 29 | 29 | * @return string |
| 30 | 30 | */ |
| 31 | 31 | final protected function baseCacheDirectory() { |
| 32 | | - global $wgCacheDirectory, $wgFileCacheDirectory, $wgFileCacheDepth; |
| 33 | | - if ( $wgFileCacheDirectory ) { |
| 34 | | - $dir = $wgFileCacheDirectory; |
| 35 | | - } elseif ( $wgCacheDirectory ) { |
| 36 | | - $dir = $wgCacheDirectory; |
| 37 | | - } else { |
| 38 | | - throw new MWException( 'Please set $wgCacheDirectory in LocalSettings.php if you wish to use the HTML file cache' ); |
| 39 | | - } |
| 40 | | - return $dir; |
| | 32 | + global $wgFileCacheDirectory; |
| | 33 | + return $wgFileCacheDirectory; |
| 41 | 34 | } |
| 42 | 35 | |
| 43 | 36 | /** |
| Index: trunk/phase3/includes/cache/HTMLFileCache.php |
| — | — | @@ -35,19 +35,10 @@ |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * Get the base file cache directory |
| 39 | | - * Note: avoids baseCacheDirectory() for b/c to not skip existing cache |
| 40 | 39 | * @return string |
| 41 | 40 | */ |
| 42 | 41 | protected function cacheDirectory() { |
| 43 | | - global $wgCacheDirectory, $wgFileCacheDirectory, $wgFileCacheDepth; |
| 44 | | - if ( $wgFileCacheDirectory ) { |
| 45 | | - $dir = $wgFileCacheDirectory; |
| 46 | | - } elseif ( $wgCacheDirectory ) { |
| 47 | | - $dir = "$wgCacheDirectory/html"; |
| 48 | | - } else { |
| 49 | | - throw new MWException( 'Please set $wgCacheDirectory in LocalSettings.php if you wish to use the HTML file cache' ); |
| 50 | | - } |
| 51 | | - return $dir; |
| | 42 | + return $this->baseCacheDirectory(); // no subdir for b/c with old cache files |
| 52 | 43 | } |
| 53 | 44 | |
| 54 | 45 | /** |