Changeset 3861

Timestamp:

01/24/2011 03:28:22 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Check that menu item exists before running is_array in bp_core_remove_nav_item

File:

• trunk/bp-core/bp-core-buddybar.php (modified) (2 diffs)

trunk/bp-core/bp-core-buddybar.php

@@ -236 +236 @@
 
     // Unset subnav items for this nav item
-    if ( is_array( $bp->bp_options_nav[$parent_id] ) ) {
+    if ( isset( $bp->bp_options_nav[$parent_id] ) && is_array( $bp->bp_options_nav[$parent_id] ) ) {
         foreach( (array)$bp->bp_options_nav[$parent_id] as $subnav_item ) {
             bp_core_remove_subnav_item( $parent_id, $subnav_item['slug'] );
@@ -243 +243 @@
 
     if ( $function = $bp->bp_nav[$parent_id]['screen_function'] ) {
-        if ( !is_object( $function[0] ) )
+        if ( !is_object( $function[0] ) ) {
             remove_action( 'wp', $function, 3 );
-        else
+        } else {
             remove_action( 'wp', array( &$function[0], $function[1] ), 3 );
+        }
     }