From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 27 Jan 2009 19:58:26 +0000 (+0000)
Subject: (bug 17180) Disable $wgShowIPinHeader if static caching is enabled
X-Git-Tag: 1.31.0-rc.0~43207
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=da25eed393edaa8383c5c150494b147ceff4c625;p=lhc%2Fweb%2Fwiklou.git

(bug 17180) Disable $wgShowIPinHeader if static caching is enabled
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 0cd9bb6144..d450dfdb58 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -197,10 +197,9 @@ if($wgMetaNamespace === FALSE) {
 # To determine the user language, use $wgLang->getCode()
 $wgContLanguageCode = $wgLanguageCode;
 
-# If file caching is enabled, disable $wgShowIPInHeader
-if ( $wgUseFileCache ) {
-	$wgShowIPinHeader = false;
-}
+# Easy to forget to falsify $wgShowIPinHeader for static caches.
+# If file cache or squid cache is on, just disable this (DWIMD).
+if( $wgUseFileCache || $wgUseSquid ) $wgShowIPinHeader = false;
 
 wfProfileOut( $fname.'-misc1' );
 wfProfileIn( $fname.'-memcached' );