Changeset 9646

Timestamp:

03/25/2015 07:54:28 PM (11 years ago)

Author:

boonebgorges

Message:

Bug fixes for bp_group_status_message().

• The $group parameter passed to the function should be obeyed when doing invite/request checks. Note that this requires that the group objects have been generated with 'populate_extras', or the is_invited etc checks will result in false negatives.
• Insert missing break that was causing all the hidden group message to be shown for private groups.

Fixes #6319.

Location:

trunk

Files:

• src/bp-groups/bp-groups-template.php (modified) (2 diffs)
• tests/phpunit/testcases/groups/template (added)
• tests/phpunit/testcases/groups/template/bpGroupStatusMessage.php (added)

trunk/src/bp-groups/bp-groups-template.php

@@ -3412 +3412 @@
                         // Private group
                         case 'private' :
-                                if ( ! bp_group_has_requested_membership() ) {
+                                if ( ! bp_group_has_requested_membership( $group ) ) {
                                         if ( is_user_logged_in() ) {
-                                                if ( bp_group_is_invited() ) {
+                                                if ( bp_group_is_invited( $group ) ) {
                                                         $message = __( 'You must accept your pending invitation before you can access this private group.', 'buddypress' );
                                                 } else {
@@ -3426 +3426 @@
                                 }
 
+                                break;
+
                         // Hidden group
                         case 'hidden' :
                         default :
                                 $message = __( 'This is a hidden group and only invited members can join.', 'buddypress' );
+                                break;
                 }
         }