From 7bc4b19203193bd36ed27ff0bd553800f7e1ee20 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Thu, 31 Dec 2015 04:06:26 +0000 Subject: [PATCH] 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 --- wp-includes/class-IXR.php | 9 ++------- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/wp-includes/class-IXR.php b/wp-includes/class-IXR.php index cbb65e599a..2fee046d41 100644 --- a/wp-includes/class-IXR.php +++ b/wp-includes/class-IXR.php @@ -201,7 +201,6 @@ class IXR_Message var $_value; var $_currentTag; var $_currentTagContents; - var $_valueHasType = false; // The XML parser var $_parser; @@ -325,8 +324,6 @@ class IXR_Message $this->_arraystructstypes[] = 'struct'; $this->_arraystructs[] = array(); break; - case 'value': - $this->_valueHasType = false; } } @@ -358,8 +355,8 @@ class IXR_Message break; case 'value': // "If no type is indicated, the type is string." - if ( !$this->_valueHasType ) { - $value = trim( $this->_currentTagContents ); + if (trim($this->_currentTagContents) != '') { + $value = (string)$this->_currentTagContents; $valueFlag = true; } break; @@ -390,8 +387,6 @@ class IXR_Message } if ($valueFlag) { - $this->_valueHasType = true; - if (count($this->_arraystructs) > 0) { // Add value to struct or array if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') { diff --git a/wp-includes/version.php b/wp-includes/version.php index 079d209e4c..f698d4db1b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @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.