From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Tue, 8 Mar 2016 21:47:55 +0000 (-0800)
Subject: Fix documentation lies about debug toolbar / cache interaction
X-Git-Tag: 1.31.0-rc.0~7590^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=2c557f381facbca83dbd6f3f4884b2885e177614;p=lhc%2Fweb%2Fwiklou.git

Fix documentation lies about debug toolbar / cache interaction

Setup.php lines 434-438:

// Easy to forget to falsify $wgDebugToolbar for static caches.
// If file cache or CDN cache is on, just disable this (DWIMD).
if ( $wgUseFileCache || $wgUseSquid ) {
	$wgDebugToolbar = false;
}

Change-Id: I911e8655026860823d6d869579d38a37157a448a
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c04602c69b..c208f08372 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5973,7 +5973,7 @@ $wgCachePrefix = false;
 /**
  * Display the new debugging toolbar. This also enables profiling on database
  * queries and other useful output.
- * Will disable file cache.
+ * Will be ignored if $wgUseFileCache or $wgUseSquid is enabled.
  *
  * @since 1.19
  */