Changeset 17057

Timestamp:

12/19/2010 09:54:13 AM (14 years ago)

Author:

westi

Message:

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

File:

• trunk/wp-includes/admin-bar.php (modified) (2 diffs)

trunk/wp-includes/admin-bar.php

@@ -49 +49 @@
     global $wp_admin_bar;
 
-    if ( ! is_object( $wp_admin_bar ) )
+    if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
         return false;
 
@@ -313 +313 @@
     global $show_admin_bar;
     $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;
 }