Changeset 10876 for trunk/src/bp-core/bp-core-buddybar.php

Timestamp:

06/10/2016 02:53:53 PM (8 years ago)

Author:

boonebgorges

Message:

Fix syntax error in back compat block of bp_core_remove_subnav_item().

The arguments were reversed, causing a compatibility break with plugins
using bp_core_remove_subnav_item() to remove group nav items.

We simplify the logic by setting $component to 'groups' in thes cases, and
letting the rest of the function handle the nav removal.

To maintain the parallel construction, a similar syntax change has been
introduced to bp_core_remove_nav_item().

Props dcavins, imath.
Fixes #6534.

File:

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

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

@@ -784 +784 @@
     if ( ! $component && bp_is_active( 'groups' ) && isset( $bp->groups->nav ) ) {
         if ( $bp->groups->nav->get_primary( array( 'slug' => $slug ) ) ) {
-            return bp_core_remove_nav_item( $slug, 'groups' );
+            $component = 'groups';
         }
     }
@@ -835 +835 @@
     if ( ! $component && bp_is_active( 'groups' ) && isset( $bp->groups->nav ) ) {
         if ( $bp->groups->nav->get_primary( array( 'slug' => $parent_slug ) ) ) {
-            return bp_core_remove_subnav_item( $slug, $parent_slug, 'groups' );
+            $component = 'groups';
         }
     }