Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-12 13:44:21 +01:00
Code Issues Projects Releases Wiki Activity

Insert from URL: Make sure the link text is actually used.

Browse Source 
Turns out there were more pieces to renaming the field.

props iseulde.
fixes #29476.

Built from https://develop.svn.wordpress.org/trunk@32055


git-svn-id: http://core.svn.wordpress.org/trunk@32034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2015-04-06 18:25:27 +00:00
parent 6d2c70aa0d
commit 42028327a2
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/ajax-actions.php
View File

@ -2484,8 +2484,8 @@ function wp_ajax_send_link_to_editor() {
if ( ! $src = esc_url_raw( $src ) )
wp_send_json_error();
if ( ! $title = trim( wp_unslash( $_POST['title'] ) ) )
$title = wp_basename( $src );
if ( ! $link_text = trim( wp_unslash( $_POST['link_text'] ) ) )
$link_text = wp_basename( $src );
$post = get_post( isset( $_POST['post_id'] ) ? $_POST['post_id'] : 0 );
@ -2498,8 +2498,8 @@ function wp_ajax_send_link_to_editor() {
if ( $check_embed !== $fallback ) {
// TinyMCE view for [embed] will parse this
$html = '[embed]' . $src . '[/embed]';
} elseif ( $title ) {
$html = '<a href="' . esc_url( $src ) . '">' . $title . '</a>';
} elseif ( $link_text ) {
$html = '<a href="' . esc_url( $src ) . '">' . $link_text . '</a>';
} else {
$html = '';
}
@ -2511,7 +2511,7 @@ function wp_ajax_send_link_to_editor() {
$type = $ext_type;
/** This filter is documented in wp-admin/includes/media.php */
$html = apply_filters( $type . '_send_to_editor_url', $html, $src, $title );
$html = apply_filters( $type . '_send_to_editor_url', $html, $src, $link_text );
wp_send_json_success( $html );
}

12
wp-includes/js/media-editor.js
View File

@ -880,7 +880,7 @@
if ( 'link' === type ) {
_.defaults( embed, {
title: embed.url,
linkText: embed.linkText,
linkUrl: embed.url
});
@ -1034,11 +1034,11 @@
*/
link: function( embed ) {
return wp.media.post( 'send-link-to-editor', {
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
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
});
}
},

2
wp-includes/js/media-editor.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/media-template.php
View File

@ -814,7 +814,7 @@ function wp_print_media_templates() {
<script type="text/html" id="tmpl-embed-link-settings">
<label class="setting link-text">
<span><?php _e( 'Link Text' ); ?></span>
<input type="text" class="alignment" data-setting="link-text" />
<input type="text" class="alignment" data-setting="linkText" />
</label>
<div class="embed-container" style="display: none;">
<div class="embed-preview"></div>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta4-32054';
$wp_version = '4.2-beta4-32055';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.