* 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(
$this->addModules( 'mediawiki.legacy.wikibits' );
}
+ if ( $wgDebugToolbar ) {
+ $this->addModules( 'mediawiki.debug' );
+ }
+
// Add various resources if required
if ( $wgUseAjax ) {
$this->addModules( 'mediawiki.legacy.ajax' );
*/
protected static $query = array();
- /**
- * Request information
- *
- * @var array
- */
- protected static $request = array();
-
/**
* Is the debugger enabled?
*
*/
public static function init() {
self::$enabled = true;
- RequestContext::getMain()->getOutput()->addModules( 'mediawiki.debug' );
}
/**
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
*
global $wgVersion, $wgRequestTime;
MWDebug::log( 'MWDebug output complete' );
+ $request = $context->getRequest();
$debugInfo = array(
'mwVersion' => $wgVersion,
'phpVersion' => PHP_VERSION,
'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 ),