Only pretty-print the parser report JS vars

Follow-up to b7c4c8717f9.

Change-Id: I3030df4ed890d9d20daca31fbd33c6d9db91b94c

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index c8a385a..d34ace8 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3082,7 +3082,12 @@ class OutputPage extends ContextSource {
         */
        function getBottomScripts() {
                return $this->getScriptsForBottomQueue() .
         */
        function getBottomScripts() {
                return $this->getScriptsForBottomQueue() .

-                       Skin::makeVariablesScript( [ 'wgPageParseReport' => $this->limitReportData ] );
+                       ResourceLoader::makeInlineScript(
+                               ResourceLoader::makeConfigSetScript(
+                                       [ 'wgPageParseReport' => $this->limitReportData ],
+                                       true
+                               )
+                       );

        }
 
        /**
        }
 
        /**

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 59f6462..1a93f6e 100644 (file)
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1388,13 +1388,14 @@ MESSAGE;
         * the given value.
         *
         * @param array $configuration List of configuration values keyed by variable name
         * the given value.
         *
         * @param array $configuration List of configuration values keyed by variable name

+        * @param bool $pretty Pretty-print with extra whitespace

         * @return string
         */
         * @return string
         */

-       public static function makeConfigSetScript( array $configuration ) {
+       public static function makeConfigSetScript( array $configuration, $pretty = null ) {

                return Xml::encodeJsCall(
                        'mw.config.set',
                        [ $configuration ],
                return Xml::encodeJsCall(
                        'mw.config.set',
                        [ $configuration ],

-                       true // readable
+                       ( $pretty === null ) ? ResourceLoader::inDebugMode() : $pretty

                );
        }
 
                );
        }