From: Domas Mituzas <midom@users.mediawiki.org>
Date: Thu, 27 Aug 2009 16:28:48 +0000 (+0000)
Subject: I LOVE OO PEOPLE <3 <3 <3
X-Git-Tag: 1.31.0-rc.0~40030
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=74b880f13f3fd8a92ea8dfc165307066fae65695;p=lhc%2Fweb%2Fwiklou.git

I LOVE OO PEOPLE <3 <3 <3
---

diff --git a/includes/Article.php b/includes/Article.php
index f8143ac1ce..5c37d9badf 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -3427,7 +3427,8 @@ class Article {
 	 */
 	public function isFileCacheable() {
 		$cacheable = false;
-		if( HTMLFileCache::useFileCache() ) {
+		global $wgUseFileCache;
+		if( $wgUseFileCache and HTMLFileCache::useFileCache() ) {
 			$cacheable = $this->getID() && !$this->mRedirectedFrom;
 			// Extension may have reason to disable file caching on some pages.
 			if( $cacheable ) {
diff --git a/includes/RawPage.php b/includes/RawPage.php
index 3e38144b16..34aa9fe301 100644
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -135,7 +135,8 @@ class RawPage {
 		$mode = $this->mPrivateCache ? 'private' : 'public';
 		header( 'Cache-Control: '.$mode.', s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
 		
-		if( HTMLFileCache::useFileCache() ) {
+		global $wgUseFileCache;
+		if( $wgUseFileCache and HTMLFileCache::useFileCache() ) {
 			$cache = new HTMLFileCache( $this->mTitle, 'raw' );
 			if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
 				$cache->loadFromFileCache();