Changeset 6926

Timestamp:

04/19/2013 08:37:02 PM (13 years ago)

Author:

boonebgorges

Message:

In bp_has_activities(), allow 'favorites' to be filtered by 'Show' dropdown

Switching the 'favorites' logic to interpret the favorite ids as part of the
'in' parameter rather than the 'include' paramater allows other filter params,
including those in the 'Show' dropdown on activity directories (the 'action'
parameter of bp_has_activities()) to work.

Fixes #4872

Props chroniko

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (1 diff)
• tests/testcases/activity/template.php (modified) (1 diff)

trunk/bp-activity/bp-activity-template.php

@@ -411 +411 @@
                         return false;
 
-                    $include          = implode( ',', (array) $favs );
+                    $in = implode( ',', (array) $favs );
                     $display_comments = true;
+                    $user_id = 0;
                     break;
                 case 'mentions':

trunk/tests/testcases/activity/template.php

@@ -57 +57 @@
     }
 
+
+    /**
+     * Make sure that action filters ('activity_update', etc) work when
+     * limiting query to user favorites
+     *
+     * @ticket BP4872
+     */
+    public function test_bp_has_activities_favorites_action_filter() {
+        $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
+
+        $a1 = $this->factory->activity->create( array(
+            'type' => 'activity_update',
+        ) );
+
+        $a2 = $this->factory->activity->create( array(
+            'type' => 'joined_group',
+        ) );
+
+        bp_activity_add_user_favorite( $a1->id, $user_id );
+        bp_activity_add_user_favorite( $a2->id, $user_id );
+
+        // groan. It sucks that you have to invoke the global
+        global $activities_template;
+
+        // Case 1: no action filter
+        bp_has_activities( array(
+            'user_id' => $user_id,
+            'scope' => 'favorites',
+        ) );
+
+        // The formatting of $activities_template->activities is messed
+        // up, so we're just going to look at the IDs. This should be
+        // fixed in BP at some point
+        $ids = wp_list_pluck( $activities_template->activities, 'id' );
+
+        $this->assertEquals( $ids, array( $a1->id, $a2->id ) );
+
+        $activities_template = null;
+
+        // Case 2: action filter
+        bp_has_activities( array(
+            'user_id' => $user_id,
+            'scope' => 'favorites',
+            'action' => 'activity_update',
+        ) );
+
+        global $wpdb, $bp;
+
+        $ids = wp_list_pluck( $activities_template->activities, 'id' );
+
+        $this->assertEquals( $ids, array( $a1->id ) );
+
+        $activities_template = null;
+    }
 }