diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-25 13:15:52 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-25 13:15:52 +0100 |
| commit | 56062a2635551c29b1b983e000f0d1ee6a482fb9 (patch) | |
| tree | 7cd9a42f9fc9e9c9d57d71d21b38b4cb0686091c /phpBB/includes | |
| parent | 8e8051f41d45199a5b8417504081672fa312731d (diff) | |
| parent | 57ce891d5f2c0b7090d44fac074ab27b4f98b93b (diff) | |
| download | forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.tar forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.tar.gz forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.tar.bz2 forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.tar.xz forums-56062a2635551c29b1b983e000f0d1ee6a482fb9.zip | |
Merge pull request #4009 from cunha17/ticket/14253
* cunha17-master:
[ticket/14253] Show group requests pending aproval at the ACP groups summary
[ticket/14253] Show group requests pending aproval at the ACP groups summary
fixes #4009
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 1f965b334c..ba39a1a60c 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -930,11 +930,12 @@ class acp_groups // used for easy access to the data within a group $cached_group_data[$type][$row['group_id']] = $row; $cached_group_data[$type][$row['group_id']]['total_members'] = 0; + $cached_group_data[$type][$row['group_id']]['pending_members'] = 0; } $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'; @@ -944,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); @@ -972,6 +974,7 @@ class acp_groups 'GROUP_NAME' => $group_name, 'TOTAL_MEMBERS' => $row['total_members'], + 'PENDING_MEMBERS' => $row['pending_members'] )); } } |