Changeset 35509

Timestamp:

11/04/2015 06:07:45 PM (9 years ago)

Author:

wonderboymusic

Message:

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

Props solarissmoke.
Fixes #16980.

File:

• trunk/src/wp-includes/class-IXR.php (modified) (4 diffs)

trunk/src/wp-includes/class-IXR.php

@@ -202 +202 @@
     var $_currentTag;
     var $_currentTagContents;
+    var $_valueHasType = false;
     // The XML parser
     var $_parser;
@@ -325 +326 @@
                 $this->_arraystructs[] = array();
                 break;
+            case 'value':
+                $this->_valueHasType = false;
         }
     }
@@ -356 +359 @@
             case 'value':
                 // "If no type is indicated, the type is string."
-                if (trim($this->_currentTagContents) != '') {
-                    $value = (string)$this->_currentTagContents;
+                if ( !$this->_valueHasType ) {
+                    $value = trim( $this->_currentTagContents );
                     $valueFlag = true;
                 }
@@ -388 +391 @@
 
         if ($valueFlag) {
+            $this->_valueHasType = true;
+                
             if (count($this->_arraystructs) > 0) {
                 // Add value to struct or array