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

Less ugly show_admin_bar() enforcement. Fixes #15869 props filosofo. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17057 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-12-19 09:54:13 +00:00
parent ade50f7e35
commit c360b4dd5f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ add_action( 'init', 'wp_admin_bar_init' );
function wp_admin_bar_render() { function wp_admin_bar_render() {
global $wp_admin_bar; global $wp_admin_bar;
if ( ! is_object( $wp_admin_bar ) ) if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
return false; return false;
$wp_admin_bar->load_user_locale_translations(); $wp_admin_bar->load_user_locale_translations();
@ -312,11 +312,6 @@ function _admin_bar_bump_cb() { ?>
function show_admin_bar( $show ) { function show_admin_bar( $show ) {
global $show_admin_bar; global $show_admin_bar;
$show_admin_bar = (bool) $show; $show_admin_bar = (bool) $show;
// Remove the object if we are not going to be showing
// Otherwise you have to call this function prior to the init hook for it to work!
if ( ! $show_admin_bar && isset( $GLOBALS['wp_admin_bar'] ) )
$GLOBALS['wp_admin_bar'] = null;
} }
/** /**