Changeset 12195

Timestamp:

07/24/2018 02:52:25 AM (7 years ago)

Author:

r-a-y

Message:

Navigation: Ensure subnav menus can be registered before the parent nav is registered.

In #7659, a bug was fixed where restricted subnav menus should be
redirected instead of throwing a 404. The side-effect of the fix is this
broke how plugins can register subnav menus before the parent nav is
created.

This commit rectifies the problem by not bailing out if the parent nav
cannot be found during subnav menu registration. Includes a unit-test.

Props dontdream, boonebgorges, r-a-y.

See #7931 (trunk).

Location:

trunk

Files:

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

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

@@ -609 +609 @@
 
     $parent_nav = $bp->{$component}->nav->get_primary( array( 'slug' => $r['parent_slug'] ), false );
-    if ( ! $parent_nav ) {
-        return ;
-    }
-
-    $parent_nav = reset( $parent_nav );
+    if ( is_array( $parent_nav ) ) {
+        $parent_nav = reset( $parent_nav );
+    }
 
     // If we *do* meet condition (2), then the added subnav item is currently being requested.

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

@@ -336 +336 @@
         $this->assertSame( 'bar', buddypress()->bp_options_nav['parent']['foo']['css_id'] );
     }
+
+    /**
+     * @ticket BP7931
+     */
+    public function test_subnav_should_not_404_on_early_bp_setup_nav_priority() {
+        $u = self::factory()->user->create();
+        $old_current_user = get_current_user_id();
+        $this->set_current_user( $u );
+
+        $user_domain = bp_core_get_user_domain( $u );
+
+        // Register a subnav on 'bp_setup_nav' hook early (at priority zero).
+        add_action( 'bp_setup_nav', function() use ( $user_domain ) {
+            /*
+             * Emulate a subnav screen.
+             *
+             * The bp_core_load_template() call is imperative for our 404 check to work!
+             */
+            $screen = function() {
+                bp_core_load_template ('members/single/plugins');
+            };
+
+            // Register the subnav.
+            bp_core_new_subnav_item( array (
+                'name'            => 'Testing',
+                'slug'            => 'testing',
+                'parent_url'      => $user_domain . bp_get_profile_slug (). '/',
+                'parent_slug'     => bp_get_profile_slug (),
+                'screen_function' => $screen,
+                'position'        => 20
+            ) );
+        }, 0 );
+
+        // Emulate visit to our new subnav page.
+        $this->go_to( $user_domain . bp_get_profile_slug () . '/testing/' );
+
+        // Assert that subnav page does not 404.
+        $this->assertFalse( is_404() );
+
+        $this->set_current_user( $old_current_user );
+    }
 }