Only run some MWDebug code when really needed:

* Add the mediawiki.debug module from OutputPage::addDefaultModules() along with other modules
* Get the request information when building the JS output instead of in Setup.php

3 files changed, 12 insertions, 29 deletions

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b9d46b4d17a3..9c46ff852998 100644
--- 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, $wgUseAjax, $wgAjaxWatch, $wgEnableMWSuggest;
+		global $wgIncludeLegacyJavaScript, $wgDebugToolbar, $wgUseAjax, $wgAjaxWatch, $wgEnableMWSuggest;
 
 		// Add base resources
 		$this->addModules( array(
@@ -2453,6 +2453,10 @@ $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 1cf803c14afd..00df897229a9 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -427,7 +427,6 @@ if ( $wgCommandLineMode ) {
 		}
 	}
 	wfDebug( "$debug\n" );
-	MWDebug::processRequest( $wgRequest );
 }
 
 wfProfileOut( $fname . '-misc1' );
diff --git a/includes/debug/Debug.php b/includes/debug/Debug.php
index b5ee0d236042..8b50838f0273 100644
--- a/includes/debug/Debug.php
+++ b/includes/debug/Debug.php
@@ -32,13 +32,6 @@ class MWDebug {
 	protected static $query = array();
 
 	/**
-	 * Request information
-	 *
-	 * @var array
-	 */
-	protected static $request = array();
-
-	/**
 	 * Is the debugger enabled?
 	 *
 	 * @var bool
@@ -59,7 +52,6 @@ class MWDebug {
 	 */
 	public static function init() {
 		self::$enabled = true;
-		RequestContext::getMain()->getOutput()->addModules( 'mediawiki.debug' );
 	}
 
 	/**
@@ -217,24 +209,6 @@ class MWDebug {
 	}
 
 	/**
-	 * 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
 	 *
 	 * @param $context IContextSource
@@ -267,6 +241,7 @@ class MWDebug {
 
 		global $wgVersion, $wgRequestTime;
 		MWDebug::log( 'MWDebug output complete' );
+		$request = $context->getRequest();
 		$debugInfo = array(
 			'mwVersion' => $wgVersion,
 			'phpVersion' => PHP_VERSION,
@@ -274,7 +249,12 @@ class MWDebug {
 			'log' => self::$log,
 			'debugLog' => self::$debug,
 			'queries' => self::$query,
-			'request' => self::$request,
+			'request' => array(
+				'method' => $_SERVER['REQUEST_METHOD'],
+				'url' => $request->getRequestURL(),
+				'headers' => $request->getAllHeaders(),
+				'params' => $request->getValues(),
+			),
 			'memory' => $context->getLanguage()->formatSize( memory_get_usage() ),
 			'memoryPeak' => $context->getLanguage()->formatSize( memory_get_peak_usage() ),
 			'includes' => self::getFilesIncluded( $context ),