Changeset 4904

Timestamp:

07/30/2011 11:53:25 AM (13 years ago)

Author:

boonebgorges

Message:

Avoid PHP notices in bp_core_remove_nav_item() and bp_core_remove_subnav_item(). Fixes #3414. Props r-a-y

File:

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

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

@@ -83 +83 @@
             $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
     }
-    
+
     do_action( 'bp_core_new_nav_item', $r, $args, $defaults );
 }
@@ -205 +205 @@
         'screen_function' => &$screen_function
     );
-    
+
     /**
      * The last step is to hook the screen function for the added subnav item. But this only
@@ -222 +222 @@
      *       user, since groups should always have an action set.
      */
-    
+
     // If we *don't* meet condition (1), return
     if ( $bp->current_component != $parent_slug && $bp->current_item != $parent_slug )
         return;
-        
+
     // If we *do* meet condition (2), then the added subnav item is currently being requested
     if ( ( !empty( $bp->current_action ) && $slug == $bp->current_action ) || ( bp_is_user() && empty( $bp->current_action ) && $screen_function == $bp->bp_nav[$parent_slug]['screen_function'] ) ) {
-    
+
         // Before hooking the screen function, check user access
         if ( $user_has_access ) {
@@ -240 +240 @@
             // depending on whether the current user is logged in
             if ( is_user_logged_in() ) {
-                // Off-limits to this user. Throw an error and redirect to the displayed user's domain          
+                // Off-limits to this user. Throw an error and redirect to the displayed user's domain
                 bp_core_no_access( array(
                     'message'   => __( 'You do not have access to this page.', 'buddypress' ),
@@ -295 +295 @@
 function bp_nav_item_has_subnav( $nav_item = '' ) {
     global $bp;
-    
+
     if ( !$nav_item )
         $nav_item = bp_current_component();
-    
+
     $has_subnav = isset( $bp->bp_options_nav[$nav_item] ) && count( $bp->bp_options_nav[$nav_item] ) > 0;
-    
+
     return apply_filters( 'bp_nav_item_has_subnav', $has_subnav, $nav_item );
 }
@@ -342 +342 @@
     global $bp;
 
-    $screen_function = $bp->bp_options_nav[$parent_id][$slug]['screen_function'];
+    $screen_function = ( isset( $bp->bp_options_nav[$parent_id][$slug]['screen_function'] ) ) ? $bp->bp_options_nav[$parent_id][$slug]['screen_function'] : false;
 
     if ( $screen_function ) {
@@ -353 +353 @@
     unset( $bp->bp_options_nav[$parent_id][$slug] );
 
-    if ( !count( $bp->bp_options_nav[$parent_id] ) )
+    if ( isset( $bp->bp_options_nav[$parent_id] ) && !count( $bp->bp_options_nav[$parent_id] ) )
         unset($bp->bp_options_nav[$parent_id]);
 }