From 289e9473dfe0d0e2309d743263facdf72194856f Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Mon, 14 Mar 2016 01:38:09 +0000
Subject: [PATCH] TinyMCE, inline link: - Remove unused user setting for
 wpLink. - Remove redundant text and variable from wp_link_dialog().

Props afercia, azaozz.
See #33301.

git-svn-id: https://develop.svn.wordpress.org/trunk@36985 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/upgrade.php   | 3 +++
 src/wp-includes/class-wp-editor.php | 8 +++-----
 src/wp-includes/css/editor.css      | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index d4c0097de1..9e4e19ddf7 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -1682,6 +1682,9 @@ function upgrade_450() {
 	if ( $wp_current_db_version < 36679 && is_multisite() ) {
 		$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'" );
 	}
+
+	// Remove unused user setting for wpLink.
+	delete_user_setting( 'wplink' );
 }
 
 /**
diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index 35cacb9292..cfa62491d7 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -1400,12 +1400,10 @@ final class _WP_Editors {
 	 * @static
 	 */
 	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 ); ?>
 		<div id="link-modal-title">
@@ -1414,7 +1412,6 @@ final class _WP_Editors {
 	 	</div>
 		<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>
 					<input id="wp-link-url" type="text" role="combobox" aria-autocomplete="list" aria-expanded="false" placeholder="<?php _e( 'Paste URL or type to search' ); ?>" /></label>
@@ -1424,7 +1421,8 @@ final class _WP_Editors {
 					<input id="wp-link-text" type="text" /></label>
 				</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>
 		</div>
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index c85f53c4f2..a5526acb79 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -1469,7 +1469,7 @@ i.mce-i-wp_code:before {
 }
 
 #wp-link label input[type="text"] {
-	margin: 5px 0 0;
+	margin: 8px 0 0;
 	width: 70%;
 }