From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 includes/api/ApiFormatWddx.php | 73 ++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 28 deletions(-)

(limited to 'includes/api/ApiFormatWddx.php')

diff --git a/includes/api/ApiFormatWddx.php b/includes/api/ApiFormatWddx.php
index ec3dc2d9..c18353fe 100644
--- a/includes/api/ApiFormatWddx.php
+++ b/includes/api/ApiFormatWddx.php
@@ -38,18 +38,30 @@ class ApiFormatWddx extends ApiFormatBase {
 	public function execute() {
 		$this->markDeprecated();
 
+		$data = $this->getResult()->getResultData( null, array(
+			'BC' => array(),
+			'Types' => array( 'AssocAsObject' => true ),
+			'Strip' => 'all',
+		) );
+
 		if ( !$this->getIsHtml() && !static::useSlowPrinter() ) {
-			$this->printText( wddx_serialize_value( $this->getResultData() ) );
+			$txt = wddx_serialize_value( $data );
+			$txt = str_replace(
+				'<struct><var name=\'php_class_name\'><string>stdClass</string></var>',
+				'<struct>',
+				$txt
+			);
+			$this->printText( $txt );
 		} else {
 			// Don't do newlines and indentation if we weren't asked
 			// for pretty output
 			$nl = ( $this->getIsHtml() ? "\n" : '' );
-			$indstr = ' ';
+			$indstr = ( $this->getIsHtml() ? ' ' : '' );
 			$this->printText( "<?xml version=\"1.0\"?>$nl" );
 			$this->printText( "<wddxPacket version=\"1.0\">$nl" );
-			$this->printText( "$indstr<header/>$nl" );
+			$this->printText( "$indstr<header />$nl" );
 			$this->printText( "$indstr<data>$nl" );
-			$this->slowWddxPrinter( $this->getResultData(), 4 );
+			$this->slowWddxPrinter( $data, 4 );
 			$this->printText( "$indstr</data>$nl" );
 			$this->printText( "</wddxPacket>$nl" );
 		}
@@ -102,44 +114,49 @@ class ApiFormatWddx extends ApiFormatBase {
 		$indstr = ( $this->getIsHtml() ? str_repeat( ' ', $indent ) : '' );
 		$indstr2 = ( $this->getIsHtml() ? str_repeat( ' ', $indent + 2 ) : '' );
 		$nl = ( $this->getIsHtml() ? "\n" : '' );
+
 		if ( is_array( $elemValue ) ) {
-			// Check whether we've got an associative array (<struct>)
-			// or a regular array (<array>)
 			$cnt = count( $elemValue );
-			if ( $cnt == 0 || array_keys( $elemValue ) === range( 0, $cnt - 1 ) ) {
-				// Regular array
-				$this->printText( $indstr . Xml::element( 'array', array(
-					'length' => $cnt ), null ) . $nl );
-				foreach ( $elemValue as $subElemValue ) {
-					$this->slowWddxPrinter( $subElemValue, $indent + 2 );
-				}
-				$this->printText( "$indstr</array>$nl" );
-			} else {
-				// Associative array (<struct>)
-				$this->printText( "$indstr<struct>$nl" );
-				foreach ( $elemValue as $subElemName => $subElemValue ) {
-					$this->printText( $indstr2 . Xml::element( 'var', array(
-						'name' => $subElemName
-					), null ) . $nl );
-					$this->slowWddxPrinter( $subElemValue, $indent + 4 );
-					$this->printText( "$indstr2</var>$nl" );
-				}
-				$this->printText( "$indstr</struct>$nl" );
+			if ( $cnt != 0 && array_keys( $elemValue ) !== range( 0, $cnt - 1 ) ) {
+				$elemValue = (object)$elemValue;
+			}
+		}
+
+		if ( is_array( $elemValue ) ) {
+			// Regular array
+			$this->printText( $indstr . Xml::element( 'array', array(
+				'length' => count( $elemValue ) ), null ) . $nl );
+			foreach ( $elemValue as $subElemValue ) {
+				$this->slowWddxPrinter( $subElemValue, $indent + 2 );
+			}
+			$this->printText( "$indstr</array>$nl" );
+		} elseif ( is_object( $elemValue ) ) {
+			// Associative array (<struct>)
+			$this->printText( "$indstr<struct>$nl" );
+			foreach ( $elemValue as $subElemName => $subElemValue ) {
+				$this->printText( $indstr2 . Xml::element( 'var', array(
+					'name' => $subElemName
+				), null ) . $nl );
+				$this->slowWddxPrinter( $subElemValue, $indent + 4 );
+				$this->printText( "$indstr2</var>$nl" );
 			}
+			$this->printText( "$indstr</struct>$nl" );
 		} elseif ( is_int( $elemValue ) || is_float( $elemValue ) ) {
 			$this->printText( $indstr . Xml::element( 'number', null, $elemValue ) . $nl );
 		} elseif ( is_string( $elemValue ) ) {
-			$this->printText( $indstr . Xml::element( 'string', null, $elemValue ) . $nl );
+			$this->printText( $indstr . Xml::element( 'string', null, $elemValue, false ) . $nl );
 		} elseif ( is_bool( $elemValue ) ) {
 			$this->printText( $indstr . Xml::element( 'boolean',
 				array( 'value' => $elemValue ? 'true' : 'false' ) ) . $nl
 			);
+		} elseif ( $elemValue === null ) {
+			$this->printText( $indstr . Xml::element( 'null', array() ) . $nl );
 		} else {
 			ApiBase::dieDebug( __METHOD__, 'Unknown type ' . gettype( $elemValue ) );
 		}
 	}
 
-	public function getDescription() {
-		return 'DEPRECATED! Output data in WDDX format' . parent::getDescription();
+	public function isDeprecated() {
+		return true;
 	}
 }
-- 
cgit v1.2.3-54-g00ecf