From: Yuri Astrakhan <yurik@wikimedia.org>
Date: Wed, 10 Jul 2013 01:54:09 +0000 (-0400)
Subject: API DebugToolbar's debugLog format cleanup
X-Git-Tag: 1.31.0-rc.0~19220^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=8dcf1e6205c05419469192ba9143a442478a1f28;p=lhc%2Fweb%2Fwiklou.git

API DebugToolbar's debugLog format cleanup

When using debug toolbar, make the result cleaner and more readable:

XML: <debugLog><msg>…</msg><msg>…</msg></debugLog>
JSON: "debugLog": ["…","…"]

Instead of current:
XML: <debugLog><msg xml:space="preserve">…</msg>...
JSON: "debugLog": [{"*": "…"}, {"*": "…"}]

Change-Id: Ieb9d3ab23d7654f5eaf3b79b3b69f4aab99d4680
---

diff --git a/includes/debug/Debug.php b/includes/debug/Debug.php
index e2cfa98b19..9f692c8d0b 100644
--- a/includes/debug/Debug.php
+++ b/includes/debug/Debug.php
@@ -498,15 +498,10 @@ class MWDebug {
 
 		$result->setIndexedTagName( $debugInfo, 'debuginfo' );
 		$result->setIndexedTagName( $debugInfo['log'], 'line' );
-		foreach ( $debugInfo['debugLog'] as $index => $debugLogText ) {
-			$vals = array();
-			ApiResult::setContent( $vals, $debugLogText );
-			$debugInfo['debugLog'][$index] = $vals; //replace
-		}
 		$result->setIndexedTagName( $debugInfo['debugLog'], 'msg' );
 		$result->setIndexedTagName( $debugInfo['queries'], 'query' );
 		$result->setIndexedTagName( $debugInfo['includes'], 'queries' );
-		$result->addValue( array(), 'debuginfo', $debugInfo );
+		$result->addValue( null, 'debuginfo', $debugInfo );
 	}
 
 	/**