diff options
| author | Timo Tijhof <krinklemail@gmail.com> | 2019-08-31 23:43:23 +0100 |
|---|---|---|
| committer | Krinkle <krinklemail@gmail.com> | 2019-09-04 16:33:25 +0000 |
| commit | d18e76dbef35efeb1f735bb070e54be5dc629e4b (patch) | |
| tree | eb5a89019ea25f893735430c2f315422396cb5c1 /includes/cache/HTMLFileCache.php | |
| parent | b0c56c7050227d5422d3b539b9ddcc44b7bf9e5a (diff) | |
| download | mediawikicore-d18e76dbef35efeb1f735bb070e54be5dc629e4b.tar.gz mediawikicore-d18e76dbef35efeb1f735bb070e54be5dc629e4b.zip | |
Setup: Move MWDebug logic to MWDebug.php
* Remove checks in HTMLFileCache.php and Article.php.
These haven't been needed since the same check was added to Setup.php,
many years ago. When FileCache is enabled, The Setup.php code disables
MWDebug. There is no reason for FileCache to then also disable itself
based on unused config. That means both of them lose.
We now handle this logic in one place: MWDebug::setup().
* In rebuildFileCache.php, turn it off explicitly, just in case.
The previous code there didn't work because finalSetup()
is called after doMaintenance.php includes Setup.php, which
is what checked this config var to decide on MWDebug::init.
On the other hand, it's also always off in CLI mode.
But, let's not depend on that, maybe we decide to enable it on
CLI one day! Just keep it off explicitly here.
Bug: T189966
Change-Id: I45a8f77092249751dc6f276aa5bb67ebf5b4f64c
Diffstat (limited to 'includes/cache/HTMLFileCache.php')
| -rw-r--r-- | includes/cache/HTMLFileCache.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php index a0d61b259efd..ab78ee469b54 100644 --- a/includes/cache/HTMLFileCache.php +++ b/includes/cache/HTMLFileCache.php @@ -95,10 +95,6 @@ class HTMLFileCache extends FileCacheBase { if ( !$config->get( 'UseFileCache' ) && $mode !== self::MODE_REBUILD ) { return false; - } elseif ( $config->get( 'DebugToolbar' ) ) { - wfDebug( "HTML file cache skipped. \$wgDebugToolbar on\n" ); - - return false; } // Get all query values |