From 13c885bdce2d074e1b1493a95d5355b7881ad6f3 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 14 Mar 2016 01:39:26 +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. Built from https://develop.svn.wordpress.org/trunk@36985 git-svn-id: http://core.svn.wordpress.org/trunk@36952 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/upgrade.php | 3 +++ wp-includes/class-wp-editor.php | 8 +++----- wp-includes/css/editor-rtl.css | 2 +- wp-includes/css/editor-rtl.min.css | 2 +- wp-includes/css/editor.css | 2 +- wp-includes/css/editor.min.css | 2 +- wp-includes/version.php | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index d4c0097de1..9e4e19ddf7 100644 --- a/wp-admin/includes/upgrade.php +++ b/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/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index 35cacb9292..cfa62491d7 100644 --- a/wp-includes/class-wp-editor.php +++ b/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 ?> -