Changeset 9476

Timestamp:

02/11/2015 09:38:40 PM (10 years ago)

Author:

r-a-y

Message:

Activity: In the 'just-me' scope, use the correct user ID variable.

Boo Ray for not catching this for v2.2.0.

Fixes #6215 (2.2-branch)

Location:

branches/2.2

Files:

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

branches/2.2/src/bp-activity/bp-activity-filters.php

@@ -675 +675 @@
         array(
             'column' => 'user_id',
-            'value'  => $filter['user_id']
+            'value'  => $user_id
         ),
         $show_hidden,

branches/2.2/tests/phpunit/testcases/activity/template.php

@@ -142 +142 @@
 
         $activities_template = null;
+    }
+
+    /**
+     * @group scope
+     * @group filter_query
+     * @group BP_Activity_Query
+     */
+    function test_bp_has_activities_just_me_scope_with_no_user_id() {
+        $u1 = $this->factory->user->create();
+        $u2 = $this->factory->user->create();
+
+        // save the current user and override logged-in user
+        $old_user = get_current_user_id();
+        $this->set_current_user( $u1 );
+
+        $now = time();
+
+        // activity item
+        $a1 = $this->factory->activity->create( array(
+            'user_id'   => $u1,
+            'component' => 'activity',
+            'type'      => 'activity_update',
+            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
+        ) );
+
+        // misc activity items
+
+        $this->factory->activity->create( array(
+            'user_id'   => $u2,
+            'component' => 'activity',
+            'type'      => 'activity_update',
+            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
+        ) );
+        $this->factory->activity->create( array(
+            'user_id'   => $u2,
+            'component' => 'groups',
+            'item_id'   => 324,
+            'type'      => 'activity_update',
+            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
+        ) );
+
+        global $activities_template;
+
+        // grab just-me scope with no user ID
+        // user ID should fallback to logged-in user ID
+        bp_has_activities( array(
+            'user_id' => false,
+            'scope' => 'just-me',
+        ) );
+
+        // assert!
+        $this->assertEqualSets( array( $a1 ), wp_list_pluck( $activities_template->activities, 'id' ) );
+
+        // clean up!
+        $activities_template = null;
+        $this->set_current_user( $old_user );
     }