Changeset 5281

Timestamp:

04/17/2007 10:00:00 PM (18 years ago)

Author:

ryan

Message:

XML-RPC fixes to allow for empty/zero settings in various fields. Props Joseph Scott. fixes #4156

File:

• trunk/xmlrpc.php (modified) (9 diffs)

trunk/xmlrpc.php

@@ -940 +940 @@
         // one has been provided.
         $post_name = "";
-        if(!empty($content_struct["wp_slug"])) {
+        if(isset($content_struct["wp_slug"])) {
             $post_name = $content_struct["wp_slug"];
         }
 
         // Only use a password if one was given.
-        if(!empty($content_struct["wp_password"])) {
+        if(isset($content_struct["wp_password"])) {
             $post_password = $content_struct["wp_password"];
         }
@@ -955 +955 @@
 
         // Only set the menu_order if it was provided.
-        if(!empty($content_struct["wp_page_order"])) {
+        if(isset($content_struct["wp_page_order"])) {
             $menu_order = $content_struct["wp_page_order"];
         }
@@ -962 +962 @@
 
         // If an author id was provided then use it instead.
-        if(!empty($content_struct["wp_author_id"])) {
+        if(
+            isset($content_struct["wp_author_id"])
+            && ($user->ID != $content_struct["wp_author_id"])
+        ) {
             switch($post_type) {
                 case "post":
@@ -990 +993 @@
       $post_more = $content_struct['mt_text_more'];
 
-      $comment_status = (!isset($content_struct['mt_allow_comments'])) ?
-        get_option('default_comment_status')
-        : $content_struct['mt_allow_comments'];
-
-      $ping_status = (!isset($content_struct['mt_allow_pings'])) ?
-        get_option('default_ping_status')
-        : $content_struct['mt_allow_pings'];
+        if(isset($content_struct["mt_allow_comments"])) {
+            switch((int) $content_struct["mt_allow_comments"]) {
+                case 0:
+                    $comment_status = "closed";
+                    break;
+                case 1:
+                    $comment_status = "open";
+                    break;
+                default:
+                    $comment_status = get_option("default_comment_status");
+                    break;
+            }
+        }
+
+        if(isset($content_struct["mt_allow_pings"])) {
+            switch((int) $content_struct["mt_allow_pings"]) {
+                case 0:
+                    $ping_status = "closed";
+                    break;
+                case 1:
+                    $ping_status = "open";
+                    break;
+                default:
+                    $ping_status = get_option("default_ping_status");
+                    break;
+            }
+        }
 
       if ($post_more) {
@@ -1074 +1097 @@
       }
 
-      set_current_user(0, $user_login);
+        $user = set_current_user(0, $user_login);
 
         // The post_type defaults to post, but could also be page.
@@ -1103 +1126 @@
         // Let WordPress manage slug if none was provided.
         $post_name = "";
-        if(!empty($content_struct["wp_slug"])) {
+        if(isset($content_struct["wp_slug"])) {
             $post_name = $content_struct["wp_slug"];
         }
 
         // Only use a password if one was given.
-        if(!empty($content_struct["wp_password"])) {
+        if(isset($content_struct["wp_password"])) {
             $post_password = $content_struct["wp_password"];
         }
@@ -1118 +1141 @@
 
         // Only set the menu_order if it was given.
-        if(!empty($content_struct["wp_page_order"])) {
+        if(isset($content_struct["wp_page_order"])) {
             $menu_order = $content_struct["wp_page_order"];
         }
 
+        $post_author = $user->ID;
+
         // Only set the post_author if one is set.
-        if(!empty($content_struct["wp_author_id"])) {
+        if(
+            isset($content_struct["wp_author_id"])
+            && ($user->ID != $content_struct["wp_author_id"])
+        ) {
             switch($post_type) {
                 case "post":
@@ -1146 +1174 @@
         // Only set ping_status if it was provided.
         if(isset($content_struct["mt_allow_pings"])) {
-            switch($content_struct["mt_allow_pings"]) {
-                case "0":
+            switch((int) $content_struct["mt_allow_pings"]) {
+                case 0:
                     $ping_status = "closed";
                     break;
-                case "1":
+                case 1:
                     $ping_status = "open";
                     break;
@@ -1188 +1216 @@
 
       if(isset($content_struct["mt_allow_comments"])) {
-        $comment_status = $content_struct["mt_allow_comments"];
+        $comment_status = (int) $content_struct["mt_allow_comments"];
       }