Changeset 8411 for trunk/src/bp-groups/bp-groups-template.php

Timestamp:

05/10/2014 02:03:21 AM (11 years ago)

Author:

boonebgorges

Message:

Introduce bp_group_is_invited(), and use it to improve private group message for non-members

When non-member visits a private group of which she is not a member, she now
sees a message that tells her to accept her pending invitation.

Fixes #5510

Props hnla

File:

• trunk/src/bp-groups/bp-groups-template.php (modified) (2 diffs)

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

@@ -1626 +1626 @@
 
 /**
+ * Check whether the current user has an outstanding invite to the current group in the loop.
+ *
+ * @param object $group Optional. Group data object. Defaults to the current
+ *        group in the groups loop.
+ * @return bool True if the user has an outstanding invite, otherwise false.
+ */
+function bp_group_is_invited( $group = false ) {
+    global $groups_template;
+
+    if ( empty( $group ) ) {
+        $group =& $groups_template->group;
+    }
+
+    return apply_filters( 'bp_group_is_invited', ! empty( $group->is_invited ) );
+}
+
+/**
  * Checks if a user is banned from a group.
  *
@@ -1956 +1973 @@
     if ( 'private' == $group->status ) {
         if ( ! bp_group_has_requested_membership() ) {
-            if ( is_user_logged_in() )
+            if ( is_user_logged_in() && bp_group_is_invited() ) {
+                $message = __( 'You must accept your pending invitation before you can access this private group.', 'buddypress' );
+            } else if ( is_user_logged_in() ) {
                 $message = __( 'This is a private group and you must request group membership in order to join.', 'buddypress' );
-            else
+            } else {
                 $message = __( 'This is a private group. To join you must be a registered site member and request group membership.', 'buddypress' );
+            }
 
         } else {