Changeset 10001

Timestamp:

07/08/2015 01:40:01 AM (9 years ago)

Author:

dcavins

Message:

Finish removing extract in bp_core_new_subnav().

Fixes if condition for a subnavigation item that
is currently being requested.

See #6503.

File:

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

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

@@ -398 +398 @@
  */
 function bp_core_register_subnav_screen_function( $args = '' ) {
+    $bp = buddypress();
+
     $r = wp_parse_args( $args, array(
         'slug'              => false, // URL slug for the screen
@@ -430 +432 @@
 
     // If we *do* meet condition (2), then the added subnav item is currently being requested
-    if ( ( bp_current_action() && bp_is_current_action( $r['slug'] ) ) || ( bp_is_user() && ! bp_current_action() && ( $r['screen_function'] == $bp->bp_nav[$parent_slug]['screen_function'] ) ) ) {
+    if ( ( bp_current_action() && bp_is_current_action( $r['slug'] ) ) || ( bp_is_user() && ! bp_current_action() && ( $r['screen_function'] == $bp->bp_nav[$r['parent_slug']]['screen_function'] ) ) ) {
 
         // If this is for site admins only and the user is not one, don't create the subnav item