XMLRPC: Revert [35509] which caused a change of behviour in at least one XMLRPC client.

XMLRPC has many quirks in it's operation, #16980 being just one of the many, #35185 just became yet another quirk.

See #16980.
Fixes #35185.

Built from https://develop.svn.wordpress.org/trunk@36132


git-svn-id: http://core.svn.wordpress.org/trunk@36098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-12-31 04:06:26 +00:00
parent 7b3b8f6fd4
commit 7bc4b19203
2 changed files with 3 additions and 8 deletions

View File

@ -201,7 +201,6 @@ class IXR_Message
var $_value; var $_value;
var $_currentTag; var $_currentTag;
var $_currentTagContents; var $_currentTagContents;
var $_valueHasType = false;
// The XML parser // The XML parser
var $_parser; var $_parser;
@ -325,8 +324,6 @@ class IXR_Message
$this->_arraystructstypes[] = 'struct'; $this->_arraystructstypes[] = 'struct';
$this->_arraystructs[] = array(); $this->_arraystructs[] = array();
break; break;
case 'value':
$this->_valueHasType = false;
} }
} }
@ -358,8 +355,8 @@ class IXR_Message
break; break;
case 'value': case 'value':
// "If no type is indicated, the type is string." // "If no type is indicated, the type is string."
if ( !$this->_valueHasType ) { if (trim($this->_currentTagContents) != '') {
$value = trim( $this->_currentTagContents ); $value = (string)$this->_currentTagContents;
$valueFlag = true; $valueFlag = true;
} }
break; break;
@ -390,8 +387,6 @@ class IXR_Message
} }
if ($valueFlag) { if ($valueFlag) {
$this->_valueHasType = true;
if (count($this->_arraystructs) > 0) { if (count($this->_arraystructs) > 0) {
// Add value to struct or array // Add value to struct or array
if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') { if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {

View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-36130'; $wp_version = '4.5-alpha-36132';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.