MediaWiki r46374 - Code Review

Index: trunk/phase3/includes/Setup.php
===================================================================
--- trunk/phase3/includes/Setup.php	(revision 46373)
+++ trunk/phase3/includes/Setup.php	(revision 46374)
@@ -197,10 +197,9 @@
 # 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' );