Changeset 36985

Timestamp:

03/14/2016 01:38:09 AM (8 years ago)

Author:

azaozz

Message:

TinyMCE, inline link:

• Remove unused user setting for wpLink.
• Remove redundant text and variable from wp_link_dialog().

Props afercia, azaozz.
See #33301.

Location:

trunk/src

Files:

• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-includes/class-wp-editor.php (modified) (3 diffs)
• wp-includes/css/editor.css (modified) (1 diff)

trunk/src/wp-admin/includes/upgrade.php

@@ -1683 +1683 @@
         $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'" );
     }
+
+    // Remove unused user setting for wpLink.
+    delete_user_setting( 'wplink' );
 }
 

trunk/src/wp-includes/class-wp-editor.php

@@ -1401 +1401 @@
      */
     public static function wp_link_dialog() {
-        $search_panel_visible = '1' == get_user_setting( 'wplink', '0' ) ? ' search-panel-visible' : '';
-
         // display: none is required here, see #WP27605
         ?>
         <div id="wp-link-backdrop" style="display: none"></div>
-        <div id="wp-link-wrap" class="wp-core-ui<?php echo $search_panel_visible; ?>" style="display: none">
+        <div id="wp-link-wrap" class="wp-core-ui" style="display: none">
         <form id="wp-link" tabindex="-1">
         <?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
@@ -1415 +1413 @@
         <div id="link-selector">
             <div id="link-options">
-                <p class="howto"><?php _e( 'Enter the destination URL' ); ?></p>
                 <div>
                     <label><span><?php _e( 'URL' ); ?></span>
@@ -1425 +1422 @@
                 </div>
                 <div class="link-target">
-                    <label><span>&nbsp;</span><input type="checkbox" id="wp-link-target" /> <?php _e( 'Open link in a new tab' ); ?></label>
+                    <label><span>&nbsp;</span>
+                    <input type="checkbox" id="wp-link-target" /> <?php _e( 'Open link in a new tab' ); ?></label>
                 </div>
             </div>

trunk/src/wp-includes/css/editor.css

@@ -1470 +1470 @@
 
 #wp-link label input[type="text"] {
-    margin: 5px 0 0;
+    margin: 8px 0 0;
     width: 70%;
 }