Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php	(revision 8890)
+++ wp-admin/includes/post.php	(working copy)
@@ -342,10 +342,9 @@
 
 	$protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' );
 
-	$metakeyselect = $wpdb->escape( stripslashes( trim( $_POST['metakeyselect'] ) ) );
-	$metakeyinput = $wpdb->escape( stripslashes( trim( $_POST['metakeyinput'] ) ) );
-	$metavalue = maybe_serialize( stripslashes( (trim( $_POST['metavalue'] ) ) ));
-	$metavalue = $wpdb->escape( $metavalue );
+	$metakeyselect = stripslashes( trim( $_POST['metakeyselect'] ) );
+	$metakeyinput = stripslashes( trim( $_POST['metakeyinput'] ) );
+	$metavalue = maybe_serialize( stripslashes( trim( $_POST['metavalue'] ) ) );
 
 	if ( ('0' === $metavalue || !empty ( $metavalue ) ) && ((('#NONE#' != $metakeyselect) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput) ) ) {
 		// We have a key/value pair. If both the select and the
@@ -362,9 +361,7 @@
 
 		wp_cache_delete($post_ID, 'post_meta');
 
-		$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta
-			(post_id,meta_key,meta_value ) VALUES (%s, %s, %s)",
-			$post_ID, $metakey, $metavalue) );
+		$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)", $post_ID, $metakey, $metavalue) );
 		return $wpdb->insert_id;
 	}
 	return false;
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 8890)
+++ wp-includes/post.php	(working copy)
@@ -519,6 +519,7 @@
 
 	// expected_slashed ($meta_key)
 	$meta_key = stripslashes($meta_key);
+	$meta_value = stripslashes($meta_value);
 
 	if ( $unique && $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->postmeta WHERE meta_key = %s AND post_id = %d", $meta_key, $post_id ) ) )
 		return false;
@@ -631,6 +632,7 @@
 
 	// expected_slashed ($meta_key)
 	$meta_key = stripslashes($meta_key);
+	$meta_value = stripslashes($meta_value);
 
 	if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->postmeta WHERE meta_key = %s AND post_id = %d", $meta_key, $post_id ) ) ) {
 		return add_post_meta($post_id, $meta_key, $meta_value);