Index: xmlrpc.php
===================================================================
--- xmlrpc.php (.../2.2) (revision 5773)
+++ xmlrpc.php (.../2.2.1) (revision 5773)
@@ -28,10 +28,10 @@
http://wordpress.org/
-
-
-
-
+
+
+
+
@@ -208,7 +208,7 @@
$allow_pings = ("open" == $page->ping_status) ? 1 : 0;
// Format page date.
- $page_date = mysql2date("Ymd\TH:i:s", $page->post_date_gmt);
+ $page_date = mysql2date("Ymd\TH:i:s\Z", $page->post_date_gmt);
// Pull the categories info together.
$categories = array();
@@ -438,7 +438,7 @@
// The date needs to be formated properly.
$num_pages = count($page_list);
for($i = 0; $i < $num_pages; $i++) {
- $post_date = mysql2date("Ymd\TH:i:s", $page_list[$i]->post_date_gmt);
+ $post_date = mysql2date("Ymd\TH:i:s\Z", $page_list[$i]->post_date_gmt);
$page_list[$i]->dateCreated = new IXR_Date($post_date);
unset($page_list[$i]->post_date_gmt);
@@ -538,7 +538,7 @@
$username = $args[1];
$password = $args[2];
$category = $args[3];
- $max_results = $args[4];
+ $max_results = (int) $args[4];
if(!$this->login_pass_ok($username, $password)) {
return($this->error);
@@ -849,7 +849,7 @@
if ( !current_user_can('edit_post', $post_ID) )
return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
- extract($actual_post);
+ extract($actual_post, EXTR_SKIP);
if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
@@ -929,8 +929,9 @@
return $this->error;
}
+ $cap = ($publish) ? 'publish_posts' : 'edit_posts';
$user = set_current_user(0, $user_login);
- if ( !current_user_can('publish_posts') )
+ if ( !current_user_can($cap) )
return new IXR_Error(401, __('Sorry, you can not post on this weblog or category.'));
// The post_type defaults to post, but could also be page.
@@ -999,32 +1000,68 @@
$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\n" . $post_more;
@@ -1126,8 +1163,8 @@
return(new IXR_Error(404, __("Invalid post id.")));
}
- extract($postdata);
$this->escape($postdata);
+ extract($postdata, EXTR_SKIP);
// Let WordPress manage slug if none was provided.
$post_name = "";
@@ -1150,7 +1187,7 @@
$menu_order = $content_struct["wp_page_order"];
}
- $post_author = $user->ID;
+ $post_author = $postdata["post_author"];
// Only set the post_author if one is set.
if(
@@ -1177,16 +1214,62 @@
$post_author = $content_struct["wp_author_id"];
}
- // Only set ping_status if it was provided.
+ if(isset($content_struct["mt_allow_comments"])) {
+ 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;
+ }
+ }
+ }
+
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;
+ 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;
+ }
+ }
}
$post_title = $content_struct['title'];
@@ -1220,10 +1303,6 @@
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)) {
@@ -1269,7 +1348,7 @@
if ($postdata['post_date'] != '') {
- $post_date = mysql2date('Ymd\TH:i:s', $postdata['post_date_gmt']);
+ $post_date = mysql2date('Ymd\TH:i:s\Z', $postdata['post_date_gmt']);
$categories = array();
$catids = wp_get_post_categories($post_ID);
@@ -1337,7 +1416,7 @@
foreach ($posts_list as $entry) {
- $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date_gmt']);
+ $post_date = mysql2date('Ymd\TH:i:s\Z', $entry['post_date_gmt']);
$categories = array();
$catids = wp_get_post_categories($entry['ID']);
foreach($catids as $catid) {
@@ -1436,6 +1515,21 @@
$type = $data['type'];
$bits = $data['bits'];
+ logIO('O', '(MW) Received '.strlen($bits).' bytes');
+
+ if ( !$this->login_pass_ok($user_login, $user_pass) )
+ return $this->error;
+
+ set_current_user(0, $user_login);
+ if ( !current_user_can('upload_files') ) {
+ logIO('O', '(MW) User does not have upload_files capability');
+ $this->error = new IXR_Error(401, __('You are not allowed to upload files to this site.'));
+ return $this->error;
+ }
+
+ if ( $upload_err = apply_filters( "pre_upload_error", false ) )
+ return new IXR_Error(500, $upload_err);
+
if(!empty($data["overwrite"]) && ($data["overwrite"] == true)) {
// Get postmeta info on the object.
$old_file = $wpdb->get_row("
@@ -1454,21 +1548,6 @@
$name = "wpid{$old_file->ID}-{$filename}";
}
- logIO('O', '(MW) Received '.strlen($bits).' bytes');
-
- if ( !$this->login_pass_ok($user_login, $user_pass) )
- return $this->error;
-
- set_current_user(0, $user_login);
- if ( !current_user_can('upload_files') ) {
- logIO('O', '(MW) User does not have upload_files capability');
- $this->error = new IXR_Error(401, __('You are not allowed to upload files to this site.'));
- return $this->error;
- }
-
- if ( $upload_err = apply_filters( "pre_upload_error", false ) )
- return new IXR_Error(500, $upload_err);
-
$upload = wp_upload_bits($name, $type, $bits, $overwrite);
if ( ! empty($upload['error']) ) {
$errorString = 'Could not write file ' . $name . ' (' . $upload['error'] . ')';
@@ -1522,7 +1601,7 @@
foreach ($posts_list as $entry) {
- $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date_gmt']);
+ $post_date = mysql2date('Ymd\TH:i:s\Z', $entry['post_date_gmt']);
$struct[] = array(
'dateCreated' => new IXR_Date($post_date),
Index: wp-settings.php
===================================================================
--- wp-settings.php (.../2.2) (revision 5773)
+++ wp-settings.php (.../2.2.1) (revision 5773)
@@ -81,7 +81,7 @@
// For an advanced caching plugin to use, static because you would only want one
if ( defined('WP_CACHE') )
- require (ABSPATH . 'wp-content/advanced-cache.php');
+ @include ABSPATH . 'wp-content/advanced-cache.php';
define('WPINC', 'wp-includes');