Changeset 10876

Timestamp:

06/10/2016 02:53:53 PM (10 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.

Location:

trunk

Files:

• src/bp-core/bp-core-buddybar.php (modified) (2 diffs)
• tests/phpunit/testcases/core/nav/bpCoreRemoveSubnavItem.php (modified) (1 diff)

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';
                 }
         }

trunk/tests/phpunit/testcases/core/nav/bpCoreRemoveSubnavItem.php

@@ -71 +71 @@
                 $bp->bp_options_nav = $_bp_options_nav;
         }
+
+        public function test_backcompat_remove_group_nav_items() {
+                $g1 = $this->factory->group->create();
+
+                // In group context
+                $g_obj = groups_get_group( array( 'group_id' => $g1 ) );
+                $this->go_to( bp_get_group_permalink( $g_obj ) );
+
+                bp_core_new_subnav_item( array(
+                        'name' => 'Clam',
+                        'slug' => 'clam',
+                        'parent_slug' => bp_get_current_group_slug(),
+                        'parent_url' => bp_get_group_permalink( $g_obj ),
+                        'screen_function' => 'clam_subnav',
+                ) );
+
+                bp_core_remove_subnav_item( $g_obj->slug, 'clam' );
+
+                $nav = bp_get_nav_menu_items( 'groups' );
+                $found = false;
+                foreach ( $nav as $_nav ) {
+                        if ( 'clam' === $_nav->css_id ) {
+                                $found = true;
+                                break;
+                        }
+                }
+
+                $this->assertFalse( $found );
+        }
 }