From: Emmet Hikory <persia@shipstone.jp>
Date: Thu, 21 Nov 2013 04:56:09 +0000 (+0900)
Subject: Update comment in DefaultSettings for bug 17180
X-Git-Tag: 1.31.0-rc.0~17956^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=fea7f88245be458ee757d4c7f174bfaf48772cc4;p=lhc%2Fweb%2Fwiklou.git

Update comment in DefaultSettings for bug 17180

When a check to disable $wgShowIPinHeader if $wgUseFileCache is
enabled was added to Setup.php (bug 17180), the inline comment
documentation in DefaultSettings.php was not adjusted, and continues
to indicate that users must manually coordinate the values of
$wgShowIPinHeader and $wgUseFileCache.  This patch adjusts the comment
to reflect the current automatic coordination.

Bug: 55723
Change-Id: I8078a3847c9ef2f386702bca5b5272028dc41e31
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8e7e76e8a4..e56a6d5704 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2134,7 +2134,7 @@ $wgStyleVersion = '303';
 /**
  * This will cache static pages for non-logged-in users to reduce
  * database traffic on public sites.
- * Must set $wgShowIPinHeader = false
+ * Automatically sets $wgShowIPinHeader = false
  * ResourceLoader requests to default language and skins are cached
  * as well as single module requests.
  */