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

Timestamp:

08/02/2016 05:15:09 AM (10 years ago)

Author:

r-a-y

Message:

Core: Fix 404 errors on single BuddyPress pages when HHVM is in use.

Debugging on a HHVM install revealed a bug with our create nav link
functions during the implementation of the new navigation API. We
shouldn't be returning the nav API methods in the nav link functions; we
should be returning the nav array item instead.

See #6534.

Fixes #7197 (trunk).

File:

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

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

@@ -153 +153 @@
 
         // Add the item to the nav.
-        $retval = buddypress()->{$component}->nav->add_nav( $nav_item );
+        buddypress()->{$component}->nav->add_nav( $nav_item );
 
         /**
@@ -168 +168 @@
         do_action( 'bp_core_create_nav_link', $r, $args, $defaults, $component );
 
-        return $retval;
+        return $nav_item;
 }
 
@@ -537 +537 @@
         );
 
-        return buddypress()->{$component}->nav->add_nav( $subnav_item );
+        buddypress()->{$component}->nav->add_nav( $subnav_item );
+
+        return $subnav_item;
 }