<!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>[37289] branches/4.5: Media: Remove an extra quote when sending a link of a media file to the 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/37289">37289</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/37289","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-21 21:33:14 +0000 (Thu, 21 Apr 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: Remove an extra quote when sending a link of a media file to the editor.
Introduced in <a href="https://core.trac.wordpress.org/changeset/37035">[37035]</a>.
Merge of <a href="https://core.trac.wordpress.org/changeset/37288">[37288]</a> to the 4.5 branch.
Props joemcgill, swissspidy, boonebgorges.
Fixes <a href="https://core.trac.wordpress.org/ticket/36578">#36578</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches45srcwpadminincludesajaxactionsphp">branches/4.5/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#branches45testsphpunitincludestestcaseajaxphp">branches/4.5/tests/phpunit/includes/testcase-ajax.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches45testsphpunittestsajaxAttachmentsphp">branches/4.5/tests/phpunit/tests/ajax/Attachments.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches45">branches/4.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.5
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.5 2016-04-21 21:20:26 UTC (rev 37288)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.5 2016-04-21 21:33:14 UTC (rev 37289)
</ins><a id="branches45"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.5</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,37192,37228,37247,37249,37273,37282,37285
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,37192,37228,37247,37249,37273,37282,37285,37288
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches45srcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.5/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.5/src/wp-admin/includes/ajax-actions.php 2016-04-21 21:20:26 UTC (rev 37288)
+++ branches/4.5/src/wp-admin/includes/ajax-actions.php 2016-04-21 21:33:14 UTC (rev 37289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2602,7 +2602,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rel = $rel ? ' rel="attachment wp-att-' . $id . '"' : ''; // Hard-coded string, $id is already sanitized
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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 . '">' . $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="branches45testsphpunitincludestestcaseajaxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.5/tests/phpunit/includes/testcase-ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.5/tests/phpunit/includes/testcase-ajax.php 2016-04-21 21:20:26 UTC (rev 37288)
+++ branches/4.5/tests/phpunit/includes/testcase-ajax.php 2016-04-21 21:33:14 UTC (rev 37289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
</span><span class="cx" style="display: block; padding: 0 10px"> 'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-remove-post-lock', 'dismiss-wp-pointer', 'heartbeat', 'nopriv_heartbeat', 'get-revision-diffs',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-remove-post-lock', 'dismiss-wp-pointer', 'send-attachment-to-editor', 'heartbeat', 'nopriv_heartbeat', 'get-revision-diffs',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'press-this-save-post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'press-this-add-category', 'crop-image', 'generate-password',
</span></span></pre></div>
<a id="branches45testsphpunittestsajaxAttachmentsphpfromrev37288trunktestsphpunittestsajaxAttachmentsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: branches/4.5/tests/phpunit/tests/ajax/Attachments.php (from rev 37288, trunk/tests/phpunit/tests/ajax/Attachments.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.5/tests/phpunit/tests/ajax/Attachments.php (rev 0)
+++ branches/4.5/tests/phpunit/tests/ajax/Attachments.php 2016-04-21 21:33:14 UTC (rev 37289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,112 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Admin ajax functions to be tested
+ */
+require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+
+/**
+ * Testing ajax attachment handling.
+ *
+ * @group ajax
+ */
+class Tests_Ajax_Attachments extends WP_Ajax_UnitTestCase {
+ /**
+ * @ticket 36578
+ */
+ public function test_wp_ajax_send_attachment_to_editor_should_return_an_image() {
+ // Become an administrator
+ $post = $_POST;
+ $user_id = self::factory()->user->create( array(
+ 'role' => 'administrator',
+ 'user_login' => 'user_36578_administrator',
+ 'user_email' => 'user_36578_administrator@example.com',
+ ) );
+ wp_set_current_user( $user_id );
+ $_POST = array_merge($_POST, $post);
+
+ $filename = DIR_TESTDATA . '/images/canola.jpg';
+ $contents = file_get_contents( $filename );
+
+ $upload = wp_upload_bits( basename( $filename ), null, $contents );
+ $attachment = $this->_make_attachment( $upload );
+
+ // Set up a default request
+ $_POST['nonce'] = wp_create_nonce( 'media-send-to-editor' );
+ $_POST['html'] = 'Bar Baz';
+ $_POST['post_id'] = 0;
+ $_POST['attachment'] = array(
+ 'id' => $attachment,
+ 'align' => 'left',
+ 'image-size' => 'large',
+ 'image_alt' => 'Foo bar',
+ 'url' => 'http://example.com/',
+ );
+
+ // Make the request
+ try {
+ $this->_handleAjax( 'send-attachment-to-editor' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ // Get the response.
+ $response = json_decode( $this->_last_response, true );
+
+ $expected = get_image_send_to_editor( $attachment, '', '', 'left', 'http://example.com/', false, 'large', 'Foo bar' );
+
+ // Ensure everything is correct
+ $this->assertTrue( $response['success'] );
+ $this->assertEquals( $expected, $response['data'] );
+ }
+
+ /**
+ * @ticket 36578
+ */
+ public function test_wp_ajax_send_attachment_to_editor_should_return_a_link() {
+ // Become an administrator
+ $post = $_POST;
+ $user_id = self::factory()->user->create( array(
+ 'role' => 'administrator',
+ 'user_login' => 'user_36578_administrator',
+ 'user_email' => 'user_36578_administrator@example.com',
+ ) );
+ wp_set_current_user( $user_id );
+ $_POST = array_merge($_POST, $post);
+
+ $filename = DIR_TESTDATA . '/formatting/entities.txt';
+ $contents = file_get_contents( $filename );
+
+ $upload = wp_upload_bits( basename( $filename ), null, $contents );
+ $attachment = $this->_make_attachment( $upload );
+
+ // Set up a default request
+ $_POST['nonce'] = wp_create_nonce( 'media-send-to-editor' );
+ $_POST['html'] = 'Bar Baz';
+ $_POST['post_id'] = 0;
+ $_POST['attachment'] = array(
+ 'id' => $attachment,
+ 'post_title' => 'Foo bar',
+ 'url' => get_attachment_link( $attachment ),
+ );
+
+ // Make the request
+ try {
+ $this->_handleAjax( 'send-attachment-to-editor' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ // Get the response.
+ $response = json_decode( $this->_last_response, true );
+
+ $expected = sprintf(
+ '<a href="%s" rel="attachment wp-att-%d">Foo bar</a>',
+ get_attachment_link( $attachment ),
+ $attachment
+ );
+
+ // Ensure everything is correct
+ $this->assertTrue( $response['success'] );
+ $this->assertEquals( $expected, $response['data'] );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>