Changeset 12131

Timestamp:

05/25/2018 11:29:28 PM (8 years ago)

Author:

r-a-y

Message:

Groups: Fix display of "Comment" button in the activity stream.

In r11959, the banned group members check is using the wrong conditional.
This caused legitimate group members to never see the "Comment" button in
the activity stream.

This commit reverses the check and adds some unit tests (which should have
been written beforehand!).

Anti-props r-a-y.

See #4429.

Fixes #7854 (3.x branch).

Location:

branches/3.0

Files:

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

branches/3.0/src/bp-groups/bp-groups-activity.php

@@ -393 +393 @@
         // If current user is not a group member or is banned, user cannot comment.
         if ( ! bp_current_user_can( 'bp_moderate' ) &&
-                ( ! groups_is_user_member( bp_loggedin_user_id(), $group_id ) || ! groups_is_user_banned( bp_loggedin_user_id(), $group_id ) )
+                ( ! groups_is_user_member( bp_loggedin_user_id(), $group_id ) || groups_is_user_banned( bp_loggedin_user_id(), $group_id ) )
         ) {
                 $retval = false;

branches/3.0/tests/phpunit/testcases/groups/activity.php

@@ -224 +224 @@
                 $this->set_current_user( $old_user );
         }
+
+        /**
+         * @group bp_activity_can_comment
+         */
+        public function test_groups_activity_can_comment() {
+                $old_user = get_current_user_id();
+                $u1 = self::factory()->user->create();
+                $u2 = self::factory()->user->create();
+
+                $g = self::factory()->group->create();
+
+                // User 1 is a group member, while user 2 isn't.
+                groups_join_group( $g, $u1 );
+
+                $a = self::factory()->activity->create( array(
+                        'component' => buddypress()->groups->id,
+                        'type' => 'created_group',
+                        'user_id' => $u1,
+                        'item_id' => $g,
+                ) );
+
+                $this->set_current_user( $u1 );
+                if ( bp_has_activities( array( 'in' => $a ) ) ) {
+                        while ( bp_activities() ) : bp_the_activity();
+                                // User 1 should be able to comment.
+                                $this->assertTrue( bp_activity_can_comment() );
+                        endwhile;
+                }
+
+                $this->set_current_user( $u2 );
+                if ( bp_has_activities( array( 'in' => $a ) ) ) {
+                        while ( bp_activities() ) : bp_the_activity();
+                                // User 2 should not be able to comment.
+                                $this->assertFalse( bp_activity_can_comment() );
+                        endwhile;
+                }
+
+                $this->set_current_user( $old_user );
+        }
 }