| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -197,10 +197,9 @@ |
| 198 | 198 | # To determine the user language, use $wgLang->getCode() |
| 199 | 199 | $wgContLanguageCode = $wgLanguageCode; |
| 200 | 200 | |
| 201 | | -# If file caching is enabled, disable $wgShowIPInHeader |
| 202 | | -if ( $wgUseFileCache ) { |
| 203 | | - $wgShowIPinHeader = false; |
| 204 | | -} |
| | 201 | +# Easy to forget to falsify $wgShowIPinHeader for static caches. |
| | 202 | +# If file cache or squid cache is on, just disable this (DWIMD). |
| | 203 | +if( $wgUseFileCache || $wgUseSquid ) $wgShowIPinHeader = false; |
| 205 | 204 | |
| 206 | 205 | wfProfileOut( $fname.'-misc1' ); |
| 207 | 206 | wfProfileIn( $fname.'-memcached' ); |