Ticket #6214: 6214.patch

src/bp-activity/bp-activity-loader.php

@@ -187 +187 @@
                 }
 
                 // Favorite activity items
-                $sub_nav[] = array(
-                        'name'            => _x( 'Favorites', 'Profile activity screen sub nav', 'buddypress' ),
-                        'slug'            => 'favorites',
-                        'parent_url'      => $activity_link,
-                        'parent_slug'     => $this->slug,
-                        'screen_function' => 'bp_activity_screen_favorites',
-                        'position'        => 30,
-                        'item_css_id'     => 'activity-favs'
-                );
+                if ( bp_activity_can_favorite() ) {
+                        $sub_nav[] = array(
+                                'name'            => _x( 'Favorites', 'Profile activity screen sub nav', 'buddypress' ),
+                                'slug'            => 'favorites',
+                                'parent_url'      => $activity_link,
+                                'parent_slug'     => $this->slug,
+                                'screen_function' => 'bp_activity_screen_favorites',
+                                'position'        => 30,
+                                'item_css_id'     => 'activity-favs'
+                        );
+                }
 
                 // Additional menu if friends is active
                 if ( bp_is_active( 'friends' ) ) {
@@ -291 +293 @@
                         }
 
                         // Favorites
-                        $wp_admin_nav[] = array(
-                                'parent' => 'my-account-' . $this->id,
-                                'id'     => 'my-account-' . $this->id . '-favorites',
-                                'title'  => _x( 'Favorites', 'My Account Activity sub nav', 'buddypress' ),
-                                'href'   => trailingslashit( $activity_link . 'favorites' )
-                        );
+                        // Favorite activity items
+                        if ( bp_activity_can_favorite() ) {
+                                $wp_admin_nav[] = array(
+                                        'parent' => 'my-account-' . $this->id,
+                                        'id'     => 'my-account-' . $this->id . '-favorites',
+                                        'title'  => _x( 'Favorites', 'My Account Activity sub nav', 'buddypress' ),
+                                        'href'   => trailingslashit( $activity_link . 'favorites' )
+                                );
+                        }
 
                         // Friends?
                         if ( bp_is_active( 'friends' ) ) {

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

@@ -3385 +3385 @@
          * @return int The total favorite count for the specified user.
          */
         function bp_get_total_favorite_count_for_user( $user_id = 0 ) {
+                $retval = false;
 
-                // Default to displayed user if none is passed
-                $user_id = empty( $user_id )
-                        ? bp_displayed_user_id()
-                        : $user_id;
+                if ( bp_activity_can_favorite() ) {
+                        // Default to displayed user if none is passed
+                        $user_id = empty( $user_id )
+                                ? bp_displayed_user_id()
+                                : $user_id;
 
-                // Get user meta if user ID exists
-                $retval = ! empty( $user_id )
-                        ? bp_activity_total_favorites_for_user( $user_id )
-                        : false;
+                        // Get user meta if user ID exists
+                        if ( ! empty( $user_id ) ) {
+                                $retval = bp_activity_total_favorites_for_user( $user_id );
+                        }
+                }
 
                 /**
                  * Filters the total favorite count for a user.