Changeset 32055

Timestamp:

04/06/2015 06:24:53 PM (12 years ago)

Author:

helen

Message:

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

Turns out there were more pieces to renaming the field.

props iseulde.
fixes #29476.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (3 diffs)
• wp-includes/js/media-editor.js (modified) (2 diffs)
• wp-includes/media-template.php (modified) (1 diff)

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

@@ -2485 +2485 @@
                 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 );
@@ -2499 +2499 @@
                 // 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 = '';
@@ -2512 +2512 @@
 
         /** 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 );

trunk/src/wp-includes/js/media-editor.js

@@ -881 +881 @@
                                 if ( 'link' === type ) {
                                         _.defaults( embed, {
-                                                title:   embed.url,
+                                                linkText: embed.linkText,
                                                 linkUrl: embed.url
                                         });
@@ -1035 +1035 @@
                         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
                                 });
                         }

trunk/src/wp-includes/media-template.php

@@ -815 +815 @@
                 <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;">