Ticket #6356: 6356.02.patch

src/bp-templates/bp-legacy/buddypress/groups/create.php

@@ -267 +267 @@
                                  */
                                 do_action( 'bp_before_group_invites_creation_step' ); ?>
 
-                                <?php if ( bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
+                                <?php if ( bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) && bp_get_new_group_invite_friend_list() ) : ?>
 
                                         <div class="left-menu">
 
@@ -316 +316 @@
 
                                         </div><!-- .main-column -->
 
-                                <?php else : ?>
+                                <?php elseif( bp_get_total_friend_count( bp_loggedin_user_id() ) && !bp_get_new_group_invite_friend_list() ) : ?>
 
+                                <div id="message" class="info">
+                                                <p><?php _e( 'You currently have no friends that can be invited to this group.', 'buddypress' ); ?></p>
+                                        </div>
+
+                                <?php else: ?>
+
                                         <div id="message" class="info">
                                                 <p><?php _e( 'Once you have built up friend connections you will be able to invite others to your group.', 'buddypress' ); ?></p>
                                         </div>