diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
| commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/debug/MWDebug.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/debug/MWDebug.php')
| -rw-r--r-- | includes/debug/MWDebug.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php index ae2d9954..1249ebae 100644 --- a/includes/debug/MWDebug.php +++ b/includes/debug/MWDebug.php @@ -432,10 +432,8 @@ class MWDebug { // Cannot use OutputPage::addJsConfigVars because those are already outputted // by the time this method is called. - $html = Html::inlineScript( - ResourceLoader::makeLoaderConditionalScript( - ResourceLoader::makeConfigSetScript( array( 'debugInfo' => $debugInfo ) ) - ) + $html = ResourceLoader::makeInlineScript( + ResourceLoader::makeConfigSetScript( array( 'debugInfo' => $debugInfo ) ) ); } |