golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@5281 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-04-17 22:00:00 +00:00
parent b4fd79f281
commit 25fcd398e5
1 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
xmlrpc.php
View File

@ -939,12 +939,12 @@ class wp_xmlrpc_server extends IXR_Server {
// Let WordPress generate the post_name (slug) unless // Let WordPress generate the post_name (slug) unless
// one has been provided. // one has been provided.
$post_name = ""; $post_name = "";
if(!empty($content_struct["wp_slug"])) { if(isset($content_struct["wp_slug"])) {
$post_name = $content_struct["wp_slug"]; $post_name = $content_struct["wp_slug"];
} }
// Only use a password if one was given. // 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"]; $post_password = $content_struct["wp_password"];
} }
@ -954,14 +954,17 @@ class wp_xmlrpc_server extends IXR_Server {
} }
// Only set the menu_order if it was provided. // 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"]; $menu_order = $content_struct["wp_page_order"];
} }
$post_author = $user->ID; $post_author = $user->ID;
// If an author id was provided then use it instead. // 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) { switch($post_type) {
case "post": case "post":
if(!current_user_can("edit_others_posts")) { if(!current_user_can("edit_others_posts")) {
@ -989,13 +992,33 @@ class wp_xmlrpc_server extends IXR_Server {
$post_excerpt = $content_struct['mt_excerpt']; $post_excerpt = $content_struct['mt_excerpt'];
$post_more = $content_struct['mt_text_more']; $post_more = $content_struct['mt_text_more'];
$comment_status = (!isset($content_struct['mt_allow_comments'])) ? if(isset($content_struct["mt_allow_comments"])) {
get_option('default_comment_status') switch((int) $content_struct["mt_allow_comments"]) {
: $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;
}
}
$ping_status = (!isset($content_struct['mt_allow_pings'])) ? if(isset($content_struct["mt_allow_pings"])) {
get_option('default_ping_status') switch((int) $content_struct["mt_allow_pings"]) {
: $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) { if ($post_more) {
$post_content = $post_content . "\n<!--more-->\n" . $post_more; $post_content = $post_content . "\n<!--more-->\n" . $post_more;
@ -1073,7 +1096,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
} }
set_current_user(0, $user_login); $user = set_current_user(0, $user_login);
// The post_type defaults to post, but could also be page. // The post_type defaults to post, but could also be page.
$post_type = "post"; $post_type = "post";
@ -1102,12 +1125,12 @@ class wp_xmlrpc_server extends IXR_Server {
// Let WordPress manage slug if none was provided. // Let WordPress manage slug if none was provided.
$post_name = ""; $post_name = "";
if(!empty($content_struct["wp_slug"])) { if(isset($content_struct["wp_slug"])) {
$post_name = $content_struct["wp_slug"]; $post_name = $content_struct["wp_slug"];
} }
// Only use a password if one was given. // 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"]; $post_password = $content_struct["wp_password"];
} }
@ -1117,12 +1140,17 @@ class wp_xmlrpc_server extends IXR_Server {
} }
// Only set the menu_order if it was given. // 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"]; $menu_order = $content_struct["wp_page_order"];
} }
$post_author = $user->ID;
// Only set the post_author if one is set. // 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) { switch($post_type) {
case "post": case "post":
if(!current_user_can("edit_others_posts")) { if(!current_user_can("edit_others_posts")) {
@ -1145,11 +1173,11 @@ class wp_xmlrpc_server extends IXR_Server {
// Only set ping_status if it was provided. // Only set ping_status if it was provided.
if(isset($content_struct["mt_allow_pings"])) { if(isset($content_struct["mt_allow_pings"])) {
switch($content_struct["mt_allow_pings"]) { switch((int) $content_struct["mt_allow_pings"]) {
case "0": case 0:
$ping_status = "closed"; $ping_status = "closed";
break; break;
case "1": case 1:
$ping_status = "open"; $ping_status = "open";
break; break;
} }
@ -1187,7 +1215,7 @@ class wp_xmlrpc_server extends IXR_Server {
$to_ping = implode(' ', $to_ping); $to_ping = implode(' ', $to_ping);
if(isset($content_struct["mt_allow_comments"])) { if(isset($content_struct["mt_allow_comments"])) {
$comment_status = $content_struct["mt_allow_comments"]; $comment_status = (int) $content_struct["mt_allow_comments"];
} }
// Do some timestamp voodoo // Do some timestamp voodoo