Ticket #49905: 49905.diff

src/wp-includes/functions.php

@@ -722 +722 @@
 }
 
 /**
- * Retrieve post title from XMLRPC XML.
+ * Retrieves post title from XML-RPC XML.
  *
- * If the title element is not part of the XML, then the default post title from
- * the $post_default_title will be used instead.
+ * If the title element is not found, the default post title
+ * from the $post_default_title global will be used instead.
  *
  * @since 0.71
  *
  * @global string $post_default_title Default XML-RPC post title.
  *
- * @param string $content XMLRPC XML Request content
- * @return string Post title
+ * @param string $content XML-RPC XML request content.
+ * @return string Post title.
  */
 function xmlrpc_getposttitle( $content ) {
         global $post_default_title;
+
+        if ( ! isset( $post_default_title ) ) {
+                $post_default_title = '';
+        }
+
         if ( preg_match( '/<title>(.+?)<\/title>/is', $content, $matchtitle ) ) {
                 $post_title = $matchtitle[1];
         } else {
                 $post_title = $post_default_title;
         }
+
         return $post_title;
 }
 
 /**
- * Retrieve the post category or categories from XMLRPC XML.
+ * Retrieves the post category or categories from XML-RPC XML.
  *
- * If the category element is not found, then the default post category will be
- * used. The return type then would be what $post_default_category. If the
- * category is found, then it will always be an array.
+ * If the category element is not found, the default post category
+ * from the $post_default_category global will be used instead.
  *
  * @since 0.71
  *
- * @global string $post_default_category Default XML-RPC post category.
+ * @global int $post_default_category Default XML-RPC post category ID.
  *
- * @param string $content XMLRPC XML Request content
- * @return string|array List of categories or category name.
+ * @param string $content XML-RPC XML request content.
+ * @return int[] Array of category IDs.
  */
 function xmlrpc_getpostcategory( $content ) {
         global $post_default_category;
+
+        if ( ! isset( $post_default_category ) ) {
+                $post_default_category = (int) get_option( 'default_category' );
+        }
+
         if ( preg_match( '/<category>(.+?)<\/category>/is', $content, $matchcat ) ) {
                 $post_category = trim( $matchcat[1], ',' );
-                $post_category = explode( ',', $post_category );
+                $post_category = array_map( 'intval', explode( ',', $post_category ) );
         } else {
-                $post_category = $post_default_category;
+                $post_category = array( $post_default_category );
         }
+
         return $post_category;
 }
 
 /**
- * XMLRPC XML content without title and category elements.
+ * XML-RPC XML content without title and category elements.
  *
  * @since 0.71
  *
- * @param string $content XML-RPC XML Request content.
- * @return string XMLRPC XML Request content without title and category elements.
+ * @param string $content XML-RPC XML request content.
+ * @return string XML-RPC XML request content without title and category elements.
  */
 function xmlrpc_removepostdata( $content ) {
         $content = preg_replace( '/<title>(.+?)<\/title>/si', '', $content );
         $content = preg_replace( '/<category>(.+?)<\/category>/si', '', $content );
         $content = trim( $content );
+
         return $content;
 }
 

src/xmlrpc.php

@@ -65 +65 @@
 require_once ABSPATH . WPINC . '/class-wp-xmlrpc-server.php';
 
 /**
- * Posts submitted via the XML-RPC interface get that title
- *
- * @name post_default_title
- * @var string
- */
-$post_default_title = '';
-
-/**
  * Filters the class used for handling XML-RPC requests.
  *
  * @since 3.1.0