Changeset 3775 for branches/1.2/bp-core/bp-core-adminbar.php

Timestamp:

01/20/2011 09:08:27 PM (14 years ago)

Author:

boonebgorges

Message:

Fixes function_exists error in previous commit. Adjusts admin menu hooks to be compatible with Network Admin in WP 3.1. Fixes #3017

File:

• branches/1.2/bp-core/bp-core-adminbar.php (modified) (1 diff)

branches/1.2/bp-core/bp-core-adminbar.php

@@ -292 +292 @@
     } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
         // Keep the WP admin bar from loading
-        show_admin_bar( false );
+        if ( function_exists( 'show_admin_bar' ) )
+            show_admin_bar( false );
         
         // Actions used to build the BP admin bar