Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Show admin bar in single site backend by default. Props dimadin. fixes #17899 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-07-21 19:41:18 +00:00
parent db8c49d886
commit 2564e26011
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/admin-bar.php
View File

@ -442,7 +442,7 @@ function is_admin_bar_showing() {
function _get_admin_bar_pref( $context, $user = 0 ) {
$pref = get_user_option( "show_admin_bar_{$context}", $user );
if ( false === $pref )
return 'admin' != $context || is_multisite();
return true;
return 'true' === $pref;
}

2
wp-includes/user.php
View File

@ -1463,7 +1463,7 @@ function wp_insert_user($userdata) {
$show_admin_bar_front = 'true';
if ( empty($show_admin_bar_admin) )
$show_admin_bar_admin = is_multisite() ? 'true' : 'false';
$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));