Ticket #13429: 13429-3.patch

wp-admin/includes/deprecated.php

@@ -936 +936 @@
         _deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' );
 
         return wp_get_theme();
-}
- No newline at end of file
+}
+
+/**
+ * Replace hrefs of attachment anchors with up-to-date permalinks.
+ *
+ * @since 2.3.0
+ * @deprecated 3.4.0
+ * @access private
+ *
+ * @param unknown_type $post_ID
+ * @return unknown
+ */
+function _fix_attachment_links( $post_ID ) {
+        _deprecated_function( __FUNCTION__, '3.4' );
+        
+        return $post_ID;
+}
+
+/**
+ * Callback for _fix_attachment_links()
+ *
+ * @deprecated 3.4.0
+ * @access private
+ */
+function _fix_attachment_links_replace_cb() {
+    _deprecated_function( __FUNCTION__, '3.4' );
+}
+

wp-admin/includes/post.php

@@ -229 +229 @@
 
         wp_update_post( $post_data );
 
-        // Now that we have an ID we can fix any attachment anchor hrefs
-        _fix_attachment_links( $post_ID );
-
         wp_set_post_lock( $post_ID );
 
         if ( current_user_can( $ptype->cap->edit_others_posts ) ) {
@@ -588 +585 @@
 
         add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
 
-        // Now that we have an ID we can fix any attachment anchor hrefs
-        _fix_attachment_links( $post_ID );
-
         wp_set_post_lock( $post_ID );
 
         return $post_ID;
@@ -740 +734 @@
 //
 
 /**
- * Replace hrefs of attachment anchors with up-to-date permalinks.
- *
- * @since 2.3.0
- * @access private
- *
- * @param unknown_type $post_ID
- * @return unknown
- */
-function _fix_attachment_links( $post_ID ) {
-        global $_fix_attachment_link_id;
-
-        $post = & get_post( $post_ID, ARRAY_A );
-
-        $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";
-        foreach ( $anchor_matches[0] as $anchor ) {
-                if ( 0 == preg_match( $search, $anchor, $id_matches ) )
-                        continue;
-
-                $id = (int) $id_matches[3];
-
-                // While we have the attachment ID, let's adopt any orphans.
-                $attachment = & get_post( $id, ARRAY_A );
-                if ( ! empty( $attachment) && ! is_object( get_post( $attachment['post_parent'] ) ) ) {
-                        $attachment['post_parent'] = $post_ID;
-                        // Escape data pulled from DB.
-                        $attachment = add_magic_quotes( $attachment );
-                        wp_update_post( $attachment );
-                }
-
-                $post_search[$i] = $anchor;
-                 $_fix_attachment_link_id = $id;
-                $post_replace[$i] = preg_replace_callback( "#href=(\"|')[^'\"]*\\1#", '_fix_attachment_links_replace_cb', $anchor );
-                ++$i;
-        }
-
-        $post['post_content'] = str_replace( $post_search, $post_replace, $post['post_content'] );
-
-        // Escape data pulled from DB.
-        $post = add_magic_quotes( $post);
-
-        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] );
-}
-
-/**
  * Move child posts to a new parent.
  *
  * @since 2.3.0