| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -726,7 +726,7 @@ |
| 727 | 727 | public function view() { |
| 728 | 728 | global $wgUser, $wgOut, $wgRequest, $wgContLang; |
| 729 | 729 | global $wgEnableParserCache, $wgStylePath, $wgParser; |
| 730 | | - global $wgUseTrackbacks; |
| | 730 | + global $wgUseTrackbacks, $wgUseFileCache; |
| 731 | 731 | |
| 732 | 732 | wfProfileIn( __METHOD__ ); |
| 733 | 733 | |
| — | — | @@ -752,7 +752,7 @@ |
| 753 | 753 | wfProfileOut( __METHOD__ ); |
| 754 | 754 | return; |
| 755 | 755 | # Try file cache |
| 756 | | - } else if( $this->tryFileCache() ) { |
| | 756 | + } else if( $wgUseFileCache && $this->tryFileCache() ) { |
| 757 | 757 | wfDebug( __METHOD__.": done file cache\n" ); |
| 758 | 758 | # tell wgOut that output is taken care of |
| 759 | 759 | $wgOut->disable(); |
| — | — | @@ -3520,8 +3520,7 @@ |
| 3521 | 3521 | */ |
| 3522 | 3522 | public function isFileCacheable() { |
| 3523 | 3523 | $cacheable = false; |
| 3524 | | - global $wgUseFileCache; |
| 3525 | | - if( $wgUseFileCache and HTMLFileCache::useFileCache() ) { |
| | 3524 | + if( HTMLFileCache::useFileCache() ) { |
| 3526 | 3525 | $cacheable = $this->getID() && !$this->mRedirectedFrom; |
| 3527 | 3526 | // Extension may have reason to disable file caching on some pages. |
| 3528 | 3527 | if( $cacheable ) { |