(bug 17180) Go ahead and disable $wgShowIPinHeader if we're using $wgUseFileCache.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 375c99d..c01074d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -67,6 +67,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 3301) Optionally sort user list according to account creation time
 * Remote description pages for foreign file repos are now fetched in the
   content language.
+* (bug 17180) If $wgUseFileCache is enabled, $wgShowIPinHeader is automatically
+  set to false.
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.

diff --git a/includes/Setup.php b/includes/Setup.php
index 859ad00..0cd9bb6 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -197,6 +197,11 @@ if($wgMetaNamespace === FALSE) {
 # To determine the user language, use $wgLang->getCode()
 $wgContLanguageCode = $wgLanguageCode;
 
+# If file caching is enabled, disable $wgShowIPInHeader
+if ( $wgUseFileCache ) {
+       $wgShowIPinHeader = false;
+}
+
 wfProfileOut( $fname.'-misc1' );
 wfProfileIn( $fname.'-memcached' );