Massive WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@407 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 3 insertions, 9 deletions

diff --git a/wp-inst/xmlrpc.php b/wp-inst/xmlrpc.php
index 279e693..97c5a21 100644
--- a/wp-inst/xmlrpc.php
+++ b/wp-inst/xmlrpc.php
@@ -379,9 +379,7 @@ class wp_xmlrpc_server extends IXR_Server {
 
 	  $post_title = xmlrpc_getposttitle($content);
 	  $post_category = xmlrpc_getpostcategory($content);
-
-	  $content = xmlrpc_removepostdata($content);
-	  $post_content = apply_filters( 'content_save_pre', $content );
+	  $post_content = xmlrpc_removepostdata($content);
 
 	  $post_date = current_time('mysql');
 	  $post_date_gmt = current_time('mysql', 1);
@@ -410,7 +408,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	  $post_ID     = $args[1];
 	  $user_login  = $args[2];
 	  $user_pass   = $args[3];
-	  $new_content = $args[4];
+	  $content     = $args[4];
 	  $publish     = $args[5];
 
 	  if (!$this->login_pass_ok($user_login, $user_pass)) {
@@ -431,13 +429,9 @@ class wp_xmlrpc_server extends IXR_Server {
 
 	  extract($actual_post);
 
-	  $content = $newcontent;
-
 	  $post_title = xmlrpc_getposttitle($content);
 	  $post_category = xmlrpc_getpostcategory($content);
-
-	  $content = xmlrpc_removepostdata($content);
-	  $post_content = apply_filters( 'content_save_pre', $content );
+	  $post_content = xmlrpc_removepostdata($content);
 
 	  $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');