Changeset 34260

Timestamp:

09/17/2015 05:54:56 AM (9 years ago)

Author:

wonderboymusic

Message:

Media: In wp_ajax_send_attachment_to_editor(), the fallback logic for $html should be tucked into an else statement so it isn't run needlessly and overwritten.

Props tychay.
Fixes #32072.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2492 +2492 @@
     }
 
-    $rel = $url = '';
-    $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
-    if ( ! empty( $attachment['url'] ) ) {
-        $url = $attachment['url'];
-        if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url )
-            $rel = ' rel="attachment wp-att-' . $id . '"';
-        $html = '<a href="' . esc_url( $url ) . '"' . $rel . '>' . $html . '</a>';
+    $rel = '';
+    $url = empty( $attachment['url'] ) ? '' : $attachment['url'];
+    if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url ) {
+        $rel = ' rel="attachment wp-att-' . $id . '"';
     }
 
@@ -2515 +2512 @@
 
         $title = ''; // We no longer insert title tags into <img> tags, as they are redundant.
-        $html = get_image_send_to_editor( $id, $caption, $title, $align, $url, (bool) $rel, $size, $alt );
+        $html = get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt );
     } elseif ( wp_attachment_is( 'video', $post ) || wp_attachment_is( 'audio', $post )  ) {
         $html = stripslashes_deep( $_POST['html'] );
+
+
+
+
+
     }