Changeset 37035 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

03/18/2016 08:04:19 PM (8 years ago)

Author:

azaozz

Message:

Media: fix erroneously inserting a rel attribute in get_image_send_to_editor(). Reverts most of [34259] and [34260] and adds a unit test.

Props joemcgill, azaozz.
Fixes #36084.

File:

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

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

@@ -2576 +2576 @@
     }
 
-    $rel = '';
     $url = empty( $attachment['url'] ) ? '' : $attachment['url'];
-    if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url ) {
-        $rel = 'attachment wp-att-' . $id;
-    }
+    $rel = ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url );
 
     remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' );
@@ -2601 +2598 @@
     } else {
         $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
+        $rel = $rel ? ' rel="attachment wp-att-' . $id . '"' : ''; // Hard-coded string, $id is already sanitized
+
         if ( ! empty( $url ) ) {
-            $html = '<a href="' . esc_url( $url ) . '"' . 'rel="' . esc_attr( $rel ) . '">' . $html . '</a>';
+            $html = '<a href="' . esc_url( $url ) . '"' . $rel . '">' . $html . '</a>';
         }
     }