Changes in trunk/wp-admin/includes/post.php [12110:12298]

File:

• trunk/wp-admin/includes/post.php (modified) (8 diffs)

trunk/wp-admin/includes/post.php

@@ -714 +714 @@
  */
 function _fix_attachment_links( $post_ID ) {
+    global $_fix_attachment_link_id;
 
     $post = & get_post( $post_ID, ARRAY_A );
@@ -741 +742 @@
 
         $post_search[$i] = $anchor;
-        $post_replace[$i] = preg_replace( "#href=(\"|')[^'\"]*\\1#e", "stripslashes( 'href=\\1' ).get_attachment_link( $id ).stripslashes( '\\1' )", $anchor );
+         $_fix_attachment_link_id = $id;
+        $post_replace[$i] = preg_replace_callback( "#href=(\"|')[^'\"]*\\1#", '_fix_attachment_links_replace_cb', $anchor );
         ++$i;
     }
@@ -751 +753 @@
 
     return wp_update_post( $post);
+}
+
+function _fix_attachment_links_replace_cb($match) {
+        global $_fix_attachment_link_id;
+        return stripslashes( 'href='.$match[1] ).get_attachment_link( $_fix_attachment_link_id ).stripslashes( $match[1] );
 }
 
@@ -767 +774 @@
     $old_ID = (int) $old_ID;
     $new_ID = (int) $new_ID;
-    return $wpdb->update($wpdb->posts, array('post_parent' => $new_ID), array('post_parent' => $old_ID) );
+
+    $children = $wpdb->get_col( $wpdb->prepare("
+        SELECT post_id
+        FROM $wpdb->postmeta
+        WHERE meta_key = '_wp_attachment_temp_parent'
+        AND meta_value = %d", $old_ID) );
+
+    foreach ( $children as $child_id ) {
+        $wpdb->update($wpdb->posts, array('post_parent' => $new_ID), array('ID' => $child_id) );
+        delete_post_meta($child_id, '_wp_attachment_temp_parent');
+    }
 }
 
@@ -927 +944 @@
  * @since unknown
  *
- * @param unknown_type $id
- * @param unknown_type $title
- * @param unknown_type $name
- * @return unknown
+ * @param int|object $id    Post ID or post object. 
+ * @param string $title (optional) Title 
+ * @param string $name (optional) Name 
+ * @return array With two entries of type string 
  */
 function get_sample_permalink($id, $title = null, $name = null) {
@@ -945 +962 @@
     if (in_array($post->post_status, array('draft', 'pending'))) {
         $post->post_status = 'publish';
-        $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID);
+        $post->post_name = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID);
     }
 
@@ -953 +970 @@
     // Note: if empty name is supplied -- use the title instead, see #6072
     if (!is_null($name)) {
-        $post->post_name = sanitize_title($name? $name : $title, $post->ID);
+        $post->post_name = sanitize_title($name ? $name : $title, $post->ID);
     }
 
@@ -981 +998 @@
 
 /**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $id
- * @param unknown_type $new_title
- * @param unknown_type $new_slug
- * @return unknown
+ * sample permalink html
+ *
+ * intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
+ * 
+ * @since unknown
+ *
+ * @param int|object $id Post ID or post object. 
+ * @param string $new_title (optional) New title  
+ * @param string $new_slug (optional) New slug 
+ * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor. 
  */
 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {