From ccf47d55c4904578880c755ea2da657651a3081a Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 29 Sep 2011 06:12:51 +0000 Subject: [PATCH] Remove remnants of show_admin_bar_admin. see #18811, see #18197. git-svn-id: http://svn.automattic.com/wordpress/trunk@18812 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/user.php | 1 - wp-includes/user.php | 4 ---- 2 files changed, 5 deletions(-) diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index ee3554a95..816a9e79f 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -119,7 +119,6 @@ function edit_user( $user_id = 0 ) { $user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' == $_POST['rich_editing'] ? 'false' : 'true'; $user->admin_color = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh'; $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false'; - $user->show_admin_bar_admin = isset( $_POST['admin_bar_admin'] ) ? 'true' : 'false'; } $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : ''; diff --git a/wp-includes/user.php b/wp-includes/user.php index e94269313..e339eb5e8 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -1330,9 +1330,6 @@ function wp_insert_user($userdata) { if ( empty($show_admin_bar_front) ) $show_admin_bar_front = 'true'; - if ( empty($show_admin_bar_admin) ) - $show_admin_bar_admin = 'true'; - $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login)); if ( $user_nicename_check ) { @@ -1365,7 +1362,6 @@ function wp_insert_user($userdata) { update_user_meta( $user_id, 'admin_color', $admin_color ); update_user_meta( $user_id, 'use_ssl', $use_ssl ); update_user_meta( $user_id, 'show_admin_bar_front', $show_admin_bar_front ); - update_user_meta( $user_id, 'show_admin_bar_admin', $show_admin_bar_admin ); $user = new WP_User($user_id);