Changeset 11147

Timestamp:

09/21/2016 11:07:33 PM (3 years ago)

Author:

r-a-y

Message:

Core: In bp_core_remove_nav_item(), fix notice when a nav item's screen function uses a class method as a callback.

Props needle, imath.

Fixes #7203.

Location:

trunk

Files:

• src/bp-core/classes/class-bp-core-nav.php (modified) (1 diff)
• tests/phpunit/testcases/core/nav/bpCoreRemoveNavItem.php (modified) (1 diff)

trunk/src/bp-core/classes/class-bp-core-nav.php

@@ -277 +277 @@
 
             // Return the deleted item's screen functions.
-            return array_unique( $screen_functions );
+            return $screen_functions;
         }
     }

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

@@ -65 +65 @@
         $bp->bp_options_nav = $_bp_options_nav;
     }
+
+    /**
+     * @ticket BP7203
+     */
+    public function test_remove_subnav_item_array_as_screen_function() {
+        $bp = buddypress();
+
+        add_filter( 'bp_is_active', array( $this, 'foo_is_active' ), 10, 2 );
+
+        $bp->foo = new stdClass;
+        $bp->foo->nav = new BP_Core_Nav( 0 );
+
+        $expected = array( 'foo', 'bar' );
+
+        bp_core_new_nav_item( array(
+            'name' => 'Foo',
+            'slug' => 'foo',
+            'screen_function' => $expected,
+        ), 'foo' );
+
+        bp_core_new_subnav_item( array(
+            'name' => 'Bar',
+            'slug' => 'bar',
+            'parent_slug' => 'foo',
+            'parent_url' => 'foo',
+            'screen_function' => $expected,
+        ), 'foo' );
+
+        remove_filter( 'bp_is_active', array( $this, 'foo_is_active' ), 10, 2 );
+
+        $this->assertNotEmpty( $bp->foo->nav->get_primary( array( 'slug' => 'foo' ), false ) );
+
+        $tested = $bp->foo->nav->delete_nav( 'foo' );
+        $this->assertSame( $expected, reset( $tested ) );
+
+        $this->assertEmpty( $bp->foo->nav->get_primary( array( 'slug' => 'foo' ), false ) );
+    }
+
+    /**
+     * Helper method to filter 'bp_is_active' for unit tests.
+     */
+    public function foo_is_active( $retval, $component ) {
+        if ( 'foo' === $component ) {
+            $retval = true;
+        }
+
+        return $retval;
+    }
 }