From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 7 Feb 2012 21:30:41 +0000 (+0000)
Subject: Disable $wgDebugToolbar if file cache is turned on, as with $$wgShowIPinHeader
X-Git-Tag: 1.31.0-rc.0~24885
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=67ac87beba89dd6c1a17fe574d2c86785d70b712;p=lhc%2Fweb%2Fwiklou.git

Disable $wgDebugToolbar if file cache is turned on, as with $$wgShowIPinHeader
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 00df897229..1e0ab0b8bb 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -299,8 +299,10 @@ $wgContLanguageCode = $wgLanguageCode;
 
 # Easy to forget to falsify $wgShowIPinHeader for static caches.
 # If file cache or squid cache is on, just disable this (DWIMD).
+# Do the same for $wgDebugToolbar.
 if ( $wgUseFileCache || $wgUseSquid ) {
 	$wgShowIPinHeader = false;
+	$wgDebugToolbar = false;
 }
 
 # $wgAllowRealName and $wgAllowUserSkin were removed in 1.16