sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XMLRPC: ensure that empty strings are not passed as `null`, which will then fail `isset()` 

Props solarissmoke.
Fixes #16980.


git-svn-id: https://develop.svn.wordpress.org/trunk@35509 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-11-04 18:07:45 +00:00
parent 395bc6e8d8
commit 75673887d1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wp-includes/class-IXR.php
View File

@ -201,6 +201,7 @@ 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;
@ -324,6 +325,8 @@ class IXR_Message
$this->_arraystructstypes[] = 'struct'; $this->_arraystructstypes[] = 'struct';
$this->_arraystructs[] = array(); $this->_arraystructs[] = array();
break; break;
case 'value':
$this->_valueHasType = false;
} }
} }
@ -355,8 +358,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 (trim($this->_currentTagContents) != '') { if ( !$this->_valueHasType ) {
$value = (string)$this->_currentTagContents; $value = trim( $this->_currentTagContents );
$valueFlag = true; $valueFlag = true;
} }
break; break;
@ -387,6 +390,8 @@ 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') {