Ticket #4469: xmlrpc.php.2.diff

xmlrpc.php

@@ -994 +994 @@
           $post_more = $content_struct['mt_text_more'];
 
                 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(!is_numeric($content_struct["mt_allow_comments"])) {
+                                switch($content_struct["mt_allow_comments"]) {
+                                        case "closed":
+                                                $comment_status = "closed";
+                                                break;
+                                        case "open":
+                                                $comment_status = "open";
+                                                break;
+                                        default:
+                                                $comment_status = get_option("default_comment_status");
+                                                break;
+                                }
                         }
+                        else {
+                                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;
+                                }
+                        }
                 }
+                else {
+                        $comment_status = get_option("default_comment_status");
+                }
 
                 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(!is_numeric($content_struct["mt_allow_pings"])) {
+                                switch($content["mt_allow_pings"]) {
+                                        case "closed":
+                                                $ping_status = "closed";
+                                                break;  
+                                        case "open":
+                                                $ping_status = "open";
+                                                break;
+                                        default:
+                                                $ping_status = get_option("default_ping_status");
+                                                break;
+                                }
                         }
+                        else {
+                                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;
+                                }
+                        }
                 }
+                else {
+                        $ping_status = get_option("default_ping_status");
+                }
 
           if ($post_more) {
             $post_content = $post_content . "\n<!--more-->\n" . $post_more;
@@ -1170 +1206 @@
                         $post_author = $content_struct["wp_author_id"];
                 }
 
+                if(isset($content_struct["mt_allow_comments"])) {
+                        if(!is_numeric($content_struct["mt_allow_comments"])) {
+                                $comment_status = $content_struct["mt_allow_comments"];
+                        }
+                        else {
+                                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"])) {
+                        if(!is_numeric($content_struct["mt_allow_pings"])) {
+                                $ping_status = $content_struct["mt_allow_pings"];
+                        }
+                        else {
+                                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;
+                                }
+                        }
+                }
+
                 // Only set ping_status if it was provided.
                 if(isset($content_struct["mt_allow_pings"])) {
                         switch((int) $content_struct["mt_allow_pings"]) {
@@ -1213 +1287 @@
           if ( is_array($to_ping) )
                 $to_ping = implode(' ', $to_ping);
 
-      if(isset($content_struct["mt_allow_comments"])) {
-                $comment_status = (int) $content_struct["mt_allow_comments"];
-      }
-
           // Do some timestamp voodoo
           $dateCreatedd = $content_struct['dateCreated'];
           if (!empty($dateCreatedd)) {