<!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>[32055] trunk/src: Insert from URL: Make sure the link text is actually used.</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/32055">32055</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/32055","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-06 18:24:53 +0000 (Mon, 06 Apr 2015)</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'>Insert from URL: Make sure the link text is actually used.
Turns out there were more pieces to renaming the field.
props iseulde.
fixes <a href="https://core.trac.wordpress.org/ticket/29476">#29476</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesjsmediaeditorjs">trunk/src/wp-includes/js/media-editor.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.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 2015-04-06 15:09:21 UTC (rev 32054)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-04-06 18:24:53 UTC (rev 32055)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2484,8 +2484,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $src = esc_url_raw( $src ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $title = trim( wp_unslash( $_POST['title'] ) ) )
- $title = wp_basename( $src );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $link_text = trim( wp_unslash( $_POST['link_text'] ) ) )
+ $link_text = wp_basename( $src );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( isset( $_POST['post_id'] ) ? $_POST['post_id'] : 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2498,8 +2498,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $check_embed !== $fallback ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // TinyMCE view for [embed] will parse this
</span><span class="cx" style="display: block; padding: 0 10px"> $html = '[embed]' . $src . '[/embed]';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $title ) {
- $html = '<a href="' . esc_url( $src ) . '">' . $title . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $link_text ) {
+ $html = '<a href="' . esc_url( $src ) . '">' . $link_text . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $html = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2511,7 +2511,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = $ext_type;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = apply_filters( $type . '_send_to_editor_url', $html, $src, $title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = apply_filters( $type . '_send_to_editor_url', $html, $src, $link_text );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success( $html );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media-editor.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media-editor.js 2015-04-06 15:09:21 UTC (rev 32054)
+++ trunk/src/wp-includes/js/media-editor.js 2015-04-06 18:24:53 UTC (rev 32055)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,7 +880,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'link' === type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _.defaults( embed, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- title: embed.url,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ linkText: embed.linkText,
</ins><span class="cx" style="display: block; padding: 0 10px"> linkUrl: embed.url
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1034,11 +1034,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> link: function( embed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return wp.media.post( 'send-link-to-editor', {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- nonce: wp.media.view.settings.nonce.sendToEditor,
- src: embed.linkUrl,
- title: embed.title,
- html: wp.media.string.link( embed ),
- post_id: wp.media.view.settings.post.id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ nonce: wp.media.view.settings.nonce.sendToEditor,
+ src: embed.linkUrl,
+ link_text: embed.linkText,
+ html: wp.media.string.link( embed ),
+ post_id: wp.media.view.settings.post.id
</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="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2015-04-06 15:09:21 UTC (rev 32054)
+++ trunk/src/wp-includes/media-template.php 2015-04-06 18:24:53 UTC (rev 32055)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -814,7 +814,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-embed-link-settings">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="setting link-text">
</span><span class="cx" style="display: block; padding: 0 10px"> <span><?php _e( 'Link Text' ); ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" class="alignment" data-setting="link-text" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" class="alignment" data-setting="linkText" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="embed-container" style="display: none;">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="embed-preview"></div>
</span></span></pre>
</div>
</div>
</body>
</html>