<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[37035] trunk: Media: fix erroneously inserting a rel attribute in `get_image_send_to_editor()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/37035">37035</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/37035","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-18 20:04:19 +0000 (Fri, 18 Mar 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: fix erroneously inserting a rel attribute in `get_image_send_to_editor()`. Reverts most of <a href="https://core.trac.wordpress.org/changeset/34259">[34259]</a> and <a href="https://core.trac.wordpress.org/changeset/34260">[34260]</a> and adds a unit test.
Props joemcgill, azaozz.
Fixes <a href="https://core.trac.wordpress.org/ticket/36084">#36084</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2016-03-18 19:44:50 UTC (rev 37034)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2016-03-18 20:04:19 UTC (rev 37035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2575,11 +2575,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $rel = '';
</del><span class="cx" style="display: block; padding: 0 10px"> $url = empty( $attachment['url'] ) ? '' : $attachment['url'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url ) {
- $rel = 'attachment wp-att-' . $id;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rel = ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2600,8 +2597,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html = stripslashes_deep( $_POST['html'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rel = $rel ? ' rel="attachment wp-att-' . $id . '"' : ''; // Hard-coded string, $id is already sanitized
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $url ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = '<a href="' . esc_url( $url ) . '"' . 'rel="' . esc_attr( $rel ) . '">' . $html . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = '<a href="' . esc_url( $url ) . '"' . $rel . '">' . $html . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2016-03-18 19:44:50 UTC (rev 37034)
+++ trunk/src/wp-admin/includes/media.php 2016-03-18 20:04:19 UTC (rev 37035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,24 +111,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title Image title attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $align Image CSS alignment property.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url Optional. Image src URL. Default empty.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $rel Optional. Image rel attribute. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool|string $rel Optional. Value for rel attribute or whether to add a dafault value. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width
</span><span class="cx" style="display: block; padding: 0 10px"> * and height values in pixels (in that order). Default 'medium'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $alt Optional. Image alt attribute. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The HTML output to insert into the editor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_image_send_to_editor( $id, $caption, $title, $align, $url = '', $rel = '', $size = 'medium', $alt = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_image_send_to_editor( $id, $caption, $title, $align, $url = '', $rel = false, $size = 'medium', $alt = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = get_image_tag($id, $alt, '', $align, $size);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = get_image_tag( $id, $alt, '', $align, $size );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $rel ) {
- $rel = ' rel="attachment wp-att-' . esc_attr( $id ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $rel ) {
+ if ( is_string( $rel ) ) {
+ $rel = ' rel="' . esc_attr( $rel ) . '"';
+ } else {
+ $rel = ' rel="attachment wp-att-' . intval( $id ) . '"';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $rel = ' rel="' . esc_attr( $rel ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rel = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $url )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = '<a href="' . esc_attr($url) . "\"$rel>$html</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = '<a href="' . esc_attr( $url ) . '"' . $rel . '>' . $html . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the image HTML markup to send to the editor.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1166,7 +1170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $align = !empty($attachment['align']) ? $attachment['align'] : 'none';
</span><span class="cx" style="display: block; padding: 0 10px"> $size = !empty($attachment['image-size']) ? $attachment['image-size'] : 'medium';
</span><span class="cx" style="display: block; padding: 0 10px"> $alt = !empty($attachment['image_alt']) ? $attachment['image_alt'] : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $rel = ( $url == get_attachment_link($attachment_id) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rel = ( strpos( $url, 'attachment_id') || $url === get_attachment_link( $attachment_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2016-03-18 19:44:50 UTC (rev 37034)
+++ trunk/tests/phpunit/tests/media.php 2016-03-18 20:04:19 UTC (rev 37035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1539,4 +1539,71 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 36084
+ */
+ function test_get_image_send_to_editor_defaults() {
+ $id = self::$large_id;
+ $caption = '';
+ $title = 'A test title value.';
+ $align = 'left';
+
+ // Calculate attachment data (default is medium).
+ $attachment = wp_get_attachment_image_src( $id, 'medium' );
+
+ $html = '<img src="%1$s" alt="" width="%2$d" height="%3$d" class="align%4$s size-medium wp-image-%5$d" />';
+ $expected = sprintf( $html, $attachment[0], $attachment[1], $attachment[2], $align, $id );
+
+ $this->assertSame( $expected, get_image_send_to_editor( $id, $caption, $title, $align ) );
+
+ $this->assertSame( $expected, get_image_send_to_editor( $id, $caption, $title, $align ) );
+ }
+
+ /**
+ * @ticket 36084
+ */
+ function test_get_image_send_to_editor_defaults_with_optional_params() {
+ $id = self::$large_id;
+ $caption = 'A test caption.';
+ $title = 'A test title value.';
+ $align = 'left';
+ $url = get_permalink( $id );
+ $rel = true;
+ $size = 'thumbnail';
+ $alt = 'An example alt value.';
+
+ // Calculate attachment data.
+ $attachment = wp_get_attachment_image_src( $id, $size );
+
+ $html = '<a href="%1$s" rel="%2$s"><img src="%3$s" alt="%4$s" width="%5$d" height="%6$d" class="size-%8$s wp-image-%9$d" /></a>';
+ $html = '[caption id="attachment_%9$d" align="align%7$s" width="%5$d"]' . $html . ' %10$s[/caption]';
+
+ $expected = sprintf( $html, $url, 'attachment wp-att-' . $id, $attachment[0], $alt, $attachment[1], $attachment[2], $align, $size, $id, $caption );
+
+ $this->assertSame( $expected, get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt ) );
+ }
+
+ /**
+ * @ticket 36084
+ */
+ function test_get_image_send_to_editor_defaults_no_caption_no_rel() {
+ $id = self::$large_id;
+ $caption = '';
+ $title = 'A test title value.';
+ $align = 'left';
+ $url = get_permalink( $id );
+ $rel = '';
+ $size = 'thumbnail';
+ $alt = 'An example alt value.';
+
+ // Calculate attachment data.
+ $attachment = wp_get_attachment_image_src( $id, $size );
+
+ $html = '<a href="%1$s"><img src="%2$s" alt="%3$s" width="%4$d" height="%5$d" class="align%6$s size-%7$s wp-image-%8$d" /></a>';
+
+ $expected = sprintf( $html, $url, $attachment[0], $alt, $attachment[1], $attachment[2], $align, $size, $id );
+
+ $this->assertSame( $expected, get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>