Reverted r109062 per code slush (also has a CR complaint)

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 9c46ff8..b9d46b4 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2440,7 +2440,7 @@ $templates
         * Add the default ResourceLoader modules to this object
         */
        private function addDefaultModules() {
-               global $wgIncludeLegacyJavaScript, $wgDebugToolbar, $wgUseAjax, $wgAjaxWatch, $wgEnableMWSuggest;
+               global $wgIncludeLegacyJavaScript, $wgUseAjax, $wgAjaxWatch, $wgEnableMWSuggest;
 
                // Add base resources
                $this->addModules( array(
@@ -2453,10 +2453,6 @@ $templates
                        $this->addModules( 'mediawiki.legacy.wikibits' );
                }
 
-               if ( $wgDebugToolbar ) {
-                       $this->addModules( 'mediawiki.debug' );
-               }
-
                // Add various resources if required
                if ( $wgUseAjax ) {
                        $this->addModules( 'mediawiki.legacy.ajax' );

diff --git a/includes/Setup.php b/includes/Setup.php
index 00df897..1cf803c 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -427,6 +427,7 @@ if ( $wgCommandLineMode ) {
                }
        }
        wfDebug( "$debug\n" );
+       MWDebug::processRequest( $wgRequest );
 }
 
 wfProfileOut( $fname . '-misc1' );

diff --git a/includes/debug/Debug.php b/includes/debug/Debug.php
index 8b50838..b5ee0d2 100644 (file)
--- a/includes/debug/Debug.php
+++ b/includes/debug/Debug.php
@@ -31,6 +31,13 @@ class MWDebug {
         */
        protected static $query = array();
 
+       /**
+        * Request information
+        *
+        * @var array
+        */
+       protected static $request = array();
+
        /**
         * Is the debugger enabled?
         *
@@ -52,6 +59,7 @@ class MWDebug {
         */
        public static function init() {
                self::$enabled = true;
+               RequestContext::getMain()->getOutput()->addModules( 'mediawiki.debug' );
        }
 
        /**
@@ -208,6 +216,24 @@ class MWDebug {
                unset( self::$query[$id]['_start'] );
        }
 
+       /**
+        * Processes a WebRequest object
+        *
+        * @param $request WebRequest
+        */
+       public static function processRequest( WebRequest $request ) {
+               if ( !self::$enabled ) {
+                       return;
+               }
+
+               self::$request = array(
+                       'method' => $_SERVER['REQUEST_METHOD'],
+                       'url' => $request->getRequestURL(),
+                       'headers' => $request->getAllHeaders(),
+                       'params' => $request->getValues(),
+               );
+       }
+
        /**
         * Returns a list of files included, along with their size
         *
@@ -241,7 +267,6 @@ class MWDebug {
 
                global $wgVersion, $wgRequestTime;
                MWDebug::log( 'MWDebug output complete' );
-               $request = $context->getRequest();
                $debugInfo = array(
                        'mwVersion' => $wgVersion,
                        'phpVersion' => PHP_VERSION,
@@ -249,12 +274,7 @@ class MWDebug {
                        'log' => self::$log,
                        'debugLog' => self::$debug,
                        'queries' => self::$query,
-                       'request' => array(
-                               'method' => $_SERVER['REQUEST_METHOD'],
-                               'url' => $request->getRequestURL(),
-                               'headers' => $request->getAllHeaders(),
-                               'params' => $request->getValues(),
-                       ),
+                       'request' => self::$request,
                        'memory' => $context->getLanguage()->formatSize( memory_get_usage() ),
                        'memoryPeak' => $context->getLanguage()->formatSize( memory_get_peak_usage() ),
                        'includes' => self::getFilesIncluded( $context ),