From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Mon, 6 Feb 2012 21:52:48 +0000 (+0000)
Subject: Follow-up r110761: removed duplicate check of $wgShowIPinHeader and fix some whitespaces
X-Git-Tag: 1.31.0-rc.0~24907
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=34789d1c85c9593667905521acc358e1f234b24c;p=lhc%2Fweb%2Fwiklou.git

Follow-up r110761: removed duplicate check of $wgShowIPinHeader and fix some whitespaces
---

diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 6b19fdfdf2..5e9d8127b3 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -65,8 +65,8 @@ class HTMLFileCache extends FileCacheBase {
 		if ( !$wgUseFileCache ) {
 			return false;
 		}
-		if( $wgShowIPinHeader || $wgDebugToolbar ) {
-			wfDebug("HTML file cache skipped. Either \$wgShowIPinHeader and/or \$wgDebugToolbar on\n" );
+		if ( $wgShowIPinHeader || $wgDebugToolbar ) {
+			wfDebug( "HTML file cache skipped. Either \$wgShowIPinHeader and/or \$wgDebugToolbar on\n" );
 			return false;
 		}
 
@@ -90,7 +90,7 @@ class HTMLFileCache extends FileCacheBase {
 		$ulang = $context->getLanguage()->getCode();
 		$clang = $wgContLang->getCode();
 		// Check that there are no other sources of variation
-		return !$wgShowIPinHeader && !$user->getId() && !$user->getNewtalk() && $ulang == $clang;
+		return !$user->getId() && !$user->getNewtalk() && $ulang == $clang;
 	}
 
 	/**