diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-15 13:19:12 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-15 13:19:12 +0000 |
commit | 8752f7651d737da0dbe86065e708347a58b40d61 (patch) | |
tree | ac80c1eb849760d123d729ffb33fb8a9dc1742db /wp-admin/admin-functions.php | |
parent | 982f28611561556403f1c1004ad41f3253205e0e (diff) | |
download | wordpress-mu-8752f7651d737da0dbe86065e708347a58b40d61.tar.gz wordpress-mu-8752f7651d737da0dbe86065e708347a58b40d61.tar.xz wordpress-mu-8752f7651d737da0dbe86065e708347a58b40d61.zip |
WP Merge to rev 4887
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@888 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-functions.php')
-rw-r--r-- | wp-admin/admin-functions.php | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 83e0e74..583aca9 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -22,6 +22,7 @@ function wp_write_post() { // Check for autosave collisions + $temp_id = false; if ( isset($_POST['temp_ID']) ) { $temp_id = (int) $_POST['temp_ID']; if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) ) @@ -33,7 +34,6 @@ function wp_write_post() { if ( isset($draft_ids[$temp_id]) ) { // Edit, don't write $_POST['post_ID'] = $draft_ids[$temp_id]; unset($_POST['temp_ID']); - relocate_children( $temp_id, $_POST['post_ID'] ); update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids ); return edit_post(); } @@ -112,9 +112,15 @@ function wp_write_post() { add_meta( $post_ID ); // Reunite any orphaned attachments with their parent + if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) ) + $draft_ids = array(); + if ( $draft_temp_id = array_search( $post_ID, $draft_ids ) ) + relocate_children( $draft_temp_id, $post_ID ); + if ( $temp_id && $temp_id != $draft_temp_id ) + relocate_children( $temp_id, $post_ID ); + // Update autosave collision detection if ( $temp_id ) { - relocate_children( $temp_id, $post_ID ); $draft_ids[$temp_id] = $post_ID; update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids ); } @@ -139,14 +145,14 @@ function fix_attachment_links( $post_ID ) { $post = & get_post( $post_ID, ARRAY_A ); - $search = "#<a[^>]+rel=('|\" )[^'\"]*attachment[^>]*>#ie"; + $search = "#<a[^>]+rel=('|\")[^'\"]*attachment[^>]*>#ie"; // See if we have any rel="attachment" links if ( 0 == preg_match_all( $search, $post['post_content'], $anchor_matches, PREG_PATTERN_ORDER ) ) return; $i = 0; - $search = "#[\s]+rel=(\"|' )(.*? )wp-att-(\d+ )\\1#i"; + $search = "#[\s]+rel=(\"|')(.*?)wp-att-(\d+)\\1#i"; foreach ( $anchor_matches[0] as $anchor ) { if ( 0 == preg_match( $search, $anchor, $id_matches ) ) continue; @@ -279,7 +285,13 @@ function edit_post() { add_meta( $post_ID ); - wp_update_post( $_POST); + wp_update_post( $_POST ); + + // Reunite any orphaned attachments with their parent + if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) ) + $draft_ids = array(); + if ( $draft_temp_id = array_search( $post_ID, $draft_ids ) ) + relocate_children( $draft_temp_id, $post_ID ); // Now that we have an ID we can fix any attachment anchor hrefs fix_attachment_links( $post_ID ); |