Ticket #14772: enabled_check_in_functions.php.diff

admin-bar.php

@@ -11 +11 @@
 function wp_admin_bar_init() {
         global $current_user, $pagenow, $wp_admin_bar;
 
-        if ( defined('WP_SHOW_ADMIN_BAR') )
-                $show_it = (bool) WP_SHOW_ADMIN_BAR;
-        else
-                $show_it = true;
-
-        if ( ! apply_filters( 'show_admin_bar', $show_it ) )
+        if ( !show_admin_bar() )
                 return false;
 
         /* Set the protocol constant used throughout this code */

functions.php

@@ -4414 +4414 @@
 function no_admin_bar() {
         define('WP_SHOW_ADMIN_BAR', false);
 }
+
+/**
+ * Checks if the admin bar has been enabled
+ *
+ * @since 3.1.0
+ */
+function show_admin_bar() {
+        $show_it=true;
+
+        if ( defined('WP_SHOW_ADMIN_BAR') )
+                $show_it = (bool) WP_SHOW_ADMIN_BAR;
+
+        if ( ! apply_filters( 'show_admin_bar', $show_it ) )
+                return false;
+
+        return true;
+}