Changeset 16824

Timestamp:

12/08/2010 10:00:40 PM (14 years ago)

Author:

markjaquith

Message:

Work around some unset variable notices in xmlrpc.php. props redsweater. props sorich87. fixes #10665

File:

• trunk/wp-includes/class-wp-xmlrpc-server.php (modified) (10 diffs)

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -1259 +1259 @@
         $comment['comment_parent'] = isset($content_struct['comment_parent']) ? absint($content_struct['comment_parent']) : 0;
 
-        $comment['comment_content'] = $content_struct['content'];
+        $comment['comment_content'] =  isset($content_struct['content']) ? $content_struct['content'] : null;
 
         do_action('xmlrpc_call', 'wp.newComment');
@@ -2180 +2180 @@
         }
 
-        $post_title = $content_struct['title'];
-        $post_content = $content_struct['description'];
+        $post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : null;
+        $post_content = isset( $content_struct['description'] ) ? $content_struct['description'] : null;
 
         $post_status = $publish ? 'publish' : 'draft';
@@ -2203 +2203 @@
         }
 
-        $post_excerpt = $content_struct['mt_excerpt'];
-        $post_more = $content_struct['mt_text_more'];
-
-        $tags_input = $content_struct['mt_keywords'];
+        $post_excerpt = isset($content_struct['mt_excerpt']) ? $content_struct['mt_excerpt'] : null;
+        $post_more = isset($content_struct['mt_text_more']) ? $content_struct['mt_text_more'] : null;
+
+        $tags_input = isset($content_struct['mt_keywords']) ? $content_struct['mt_keywords'] : null;
 
         if ( isset($content_struct["mt_allow_comments"]) ) {
@@ -2272 +2272 @@
             $post_content = $post_content . "<!--more-->" . $post_more;
 
-        $to_ping = $content_struct['mt_tb_ping_urls'];
-        if ( is_array($to_ping) )
-            $to_ping = implode(' ', $to_ping);
+        $to_ping = null;
+        if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
+            $to_ping = $content_struct['mt_tb_ping_urls'];
+            if ( is_array($to_ping) )
+                $to_ping = implode(' ', $to_ping);
+        }
 
         // Do some timestamp voodoo
@@ -2290 +2293 @@
         }
 
-        $catnames = $content_struct['categories'];
-        logIO('O', 'Post cats: ' . var_export($catnames,true));
         $post_category = array();
-
-        if ( is_array($catnames) ) {
-            foreach ($catnames as $cat) {
-                $post_category[] = get_cat_ID($cat);
+        if ( isset( $content_struct['categories'] ) ) {
+            $catnames = $content_struct['categories'];
+            logIO('O', 'Post cats: ' . var_export($catnames,true));
+
+            if ( is_array($catnames) ) {
+                foreach ($catnames as $cat) {
+                    $post_category[] = get_cat_ID($cat);
+                }
             }
         }
@@ -2322 +2327 @@
 
         // Handle enclosures
-        $this->add_enclosure_if_new($post_ID, $content_struct['enclosure']);
+        $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
+        $this->add_enclosure_if_new($post_ID, $thisEnclosure);
 
         $this->attach_uploads( $post_ID, $post_content );
@@ -2550 +2556 @@
         }
 
-        $post_title = $content_struct['title'];
-        $post_content = $content_struct['description'];
-        $catnames = $content_struct['categories'];
+        $post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : null;
+        $post_content = isset( $content_struct['description'] ) ? $content_struct['description'] : null;
 
         $post_category = array();
-
-        if ( is_array($catnames) ) {
-            foreach ($catnames as $cat) {
-                $post_category[] = get_cat_ID($cat);
+        if ( isset( $content_struct['categories'] ) ) {
+            $catnames = $content_struct['categories'];
+            if ( is_array($catnames) ) {
+                foreach ($catnames as $cat) {
+                    $post_category[] = get_cat_ID($cat);
+                }
             }
         }
 
-        $post_excerpt = $content_struct['mt_excerpt'];
-        $post_more = $content_struct['mt_text_more'];
+        $post_excerpt = isset( $content_struct['mt_excerpt'] ) ? $content_struct['mt_excerpt'] : null;
+        $post_more = isset( $content_struct['mt_text_more'] ) ? $content_struct['mt_text_more'] : null;
 
         $post_status = $publish ? 'publish' : 'draft';
@@ -2584 +2591 @@
         }
 
-        $tags_input = $content_struct['mt_keywords'];
+        $tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null;
 
         if ( ('publish' == $post_status) ) {
@@ -2596 +2603 @@
             $post_content = $post_content . "<!--more-->" . $post_more;
 
-        $to_ping = $content_struct['mt_tb_ping_urls'];
-        if ( is_array($to_ping) )
-            $to_ping = implode(' ', $to_ping);
+        $to_ping = null;
+        if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
+            $to_ping = $content_struct['mt_tb_ping_urls'];
+            if ( is_array($to_ping) )
+                $to_ping = implode(' ', $to_ping);
+        }
 
         // Do some timestamp voodoo
@@ -2636 +2646 @@
 
         // Handle enclosures
-        $this->add_enclosure_if_new($post_ID, $content_struct['enclosure']);
+        $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
+        $this->add_enclosure_if_new($post_ID, $thisEnclosure);
 
         $this->attach_uploads( $ID, $post_content );