diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 23f6e744c0..ffde27a437 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -267,11 +267,12 @@ - + + @@ -281,7 +282,7 @@ - + @@ -302,11 +303,12 @@

{L_SPECIAL_GROUPS_EXPLAIN}

{L_GROUP} {L_TOTAL_MEMBERS}{L_PENDING_MEMBERS} {L_OPTIONS} {L_ACTION}
{L_NO_GROUPS_CREATED}{L_NO_GROUPS_CREATED}
- + + @@ -316,6 +318,7 @@ + diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 223dd06987..ba39a1a60c 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -935,7 +935,7 @@ class acp_groups $db->sql_freeresult($result); // How many people are in which group? - $sql = 'SELECT COUNT(ug.user_id) AS total_members, ug.group_id + $sql = 'SELECT COUNT(ug.user_id) AS total_members, SUM(ug.user_pending) AS pending_members, ug.group_id FROM ' . USER_GROUP_TABLE . ' ug WHERE ' . $db->sql_in_set('ug.group_id', array_keys($lookup)) . ' GROUP BY ug.group_id'; @@ -945,6 +945,7 @@ class acp_groups { $type = $lookup[$row['group_id']]; $cached_group_data[$type][$row['group_id']]['total_members'] = $row['total_members']; + $cached_group_data[$type][$row['group_id']]['pending_members'] = $row['pending_members']; } $db->sql_freeresult($result); @@ -973,6 +974,7 @@ class acp_groups 'GROUP_NAME' => $group_name, 'TOTAL_MEMBERS' => $row['total_members'], + 'PENDING_MEMBERS' => $row['pending_members'] )); } } diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index 421075ce5e..9d0bb5f8b9 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -130,6 +130,8 @@ $lang = array_merge($lang, array( 'NO_USERS_ADDED' => 'No users were added to the group.', 'NO_VALID_USERS' => 'You haven’t entered any users eligible for that action.', + 'PENDING_MEMBERS' => 'Pending', + 'SELECT_GROUP' => 'Select a group', 'SPECIAL_GROUPS' => 'Pre-defined groups', 'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
{L_GROUP} {L_TOTAL_MEMBERS}{L_PENDING_MEMBERS} {L_OPTIONS} {L_ACTION}
{groups.GROUP_NAME} {groups.TOTAL_MEMBERS}{groups.PENDING_MEMBERS} {L_SETTINGS} {L_MEMBERS} {L_DELETE}{L_DELETE}