WP Merge

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

1 files changed, 14 insertions, 16 deletions

diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php
index 1c959b0..a4911b1 100644
--- a/wp-inst/wp-admin/admin-functions.php
+++ b/wp-inst/wp-admin/admin-functions.php
@@ -175,26 +175,24 @@ function edit_post() {
 		$_POST['post_date_gmt'] = get_gmt_from_date("$aa-$mm-$jj $hh:$mn:$ss");
 	}
 
-	wp_update_post($_POST);
-
-	// Now that we have an ID we can fix any attachment anchor hrefs
-	fix_attachment_links($_POST['ID']);
-
 	// Meta Stuff
-	if ($_POST['meta'])
-		: foreach ($_POST['meta'] as $key => $value)
-			: update_meta($key, $value['key'], $value['value']);
-	endforeach;
-	endif;
-
-	if ($_POST['deletemeta'])
-		: foreach ($_POST['deletemeta'] as $key => $value)
-			: delete_meta($key);
-	endforeach;
-	endif;
+	if ($_POST['meta']) {
+		foreach ($_POST['meta'] as $key => $value)
+			update_meta($key, $value['key'], $value['value']);
+	}
+	
+	if ($_POST['deletemeta']) {
+		foreach ($_POST['deletemeta'] as $key => $value)
+			delete_meta($key);
+	}
 
 	add_meta($post_ID);
 
+	wp_update_post($_POST);
+
+	// Now that we have an ID we can fix any attachment anchor hrefs
+	fix_attachment_links($post_ID);
+
 	return $post_ID;
 }