Ticket #8892: #8892.patch

src/bp-activity/bp-activity-template.php

@@ -3190 +3190 @@
  */
 function bp_activity_can_comment() {
         global $activities_template;
-        $bp = buddypress();
 
         // Determine ability to comment based on activity type name.
         $activity_type = bp_get_activity_type();

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

@@ -119 +119 @@
  * @return false|array Returns false on failure, new nav item on success.
  */
 function bp_core_create_nav_link( $args = '', $component = 'members' ) {
-        $bp = buddypress();
 
         $defaults = array(
                 'component_id'            => '',    // The component ID registering this nav item.
@@ -538 +537 @@
  * @return false|array Returns false on failure, new BP_Core_Nav_Item instance on success.
  */
 function bp_core_create_subnav_link( $args = '', $component = 'members' ) {
-        $bp = buddypress();
 
         $r = bp_parse_args(
                 $args,

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

@@ -216 +216 @@
          * @return bool|array
          */
         protected function get_nav( $offset ) {
-                $bp = buddypress();
 
                 $component_nav = $this->get_component_nav( $offset );
                 $primary_nav   = $component_nav->get_primary( array( 'slug' => $offset ), false );