| Index: trunk/phase3/includes/HTMLFileCache.php |
| — | — | @@ -32,7 +32,11 @@ |
| 33 | 33 | if( !$this->mFileCache ) { |
| 34 | 34 | global $wgCacheDirectory, $wgFileCacheDirectory; |
| 35 | 35 | |
| 36 | | - if ( !$wgFileCacheDirectory && !$wgCacheDirectory ) { |
| | 36 | + if ( $wgFileCacheDirectory ) { |
| | 37 | + $dir = $wgFileCacheDirectory; |
| | 38 | + } elseif ( $wgCacheDirectory ) { |
| | 39 | + $dir = "$wgCacheDirectory/html"; |
| | 40 | + } else { |
| 37 | 41 | throw new MWException( 'Please set $wgCacheDirectory in LocalSettings.php if you wish to use the HTML file cache' ); |
| 38 | 42 | } |
| 39 | 43 | |
| — | — | @@ -45,7 +49,7 @@ |
| 46 | 50 | |
| 47 | 51 | $hash1 = substr( $hash, 0, 1 ); |
| 48 | 52 | $hash2 = substr( $hash, 0, 2 ); |
| 49 | | - $this->mFileCache = "{$wgFileCacheDirectory}/{$subdir}{$hash1}/{$hash2}/{$key}.html"; |
| | 53 | + $this->mFileCache = "{$dir}/{$subdir}{$hash1}/{$hash2}/{$key}.html"; |
| 50 | 54 | |
| 51 | 55 | if( $this->useGzip() ) { |
| 52 | 56 | $this->mFileCache .= '.gz'; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -405,6 +405,8 @@ |
| 406 | 406 | * (bug 25713) SpecialPage::resolveAlias() now normalise spaces to underscores |
| 407 | 407 | * (bug 25829) Special:Mypage and Special:Mytalk now forward oldid, diff and dir |
| 408 | 408 | parameters |
| | 409 | +* (bug 25175) HTML file cache now honor $wgCacheDirectory if |
| | 410 | + $wgFileCacheDirectory is not set |
| 409 | 411 | |
| 410 | 412 | === API changes in 1.17 === |
| 411 | 413 | * (bug 22738) Allow filtering by action type on query=logevent. |