diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-01-24 19:09:25 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-24 19:09:25 +0100 |
| commit | 128a6e4c8df87effb5dafee5b21cde202d98e72f (patch) | |
| tree | 549a4e6b370486f1824a6ba2db18898cc55cb1d9 /phpBB/includes | |
| parent | 10691fda8ed476cefffe1670eb300a1b4804259c (diff) | |
| parent | 875dc63c6f2e98ccedad153ad3761f11bf24ff5d (diff) | |
| download | forums-128a6e4c8df87effb5dafee5b21cde202d98e72f.tar forums-128a6e4c8df87effb5dafee5b21cde202d98e72f.tar.gz forums-128a6e4c8df87effb5dafee5b21cde202d98e72f.tar.bz2 forums-128a6e4c8df87effb5dafee5b21cde202d98e72f.tar.xz forums-128a6e4c8df87effb5dafee5b21cde202d98e72f.zip | |
Merge pull request #5101 from senky/ticket/15529
[ticket/15529] Color groups in ACP
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 70ae9876f4..0e058213e0 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -926,7 +926,7 @@ class acp_groups ); // Get us all the groups - $sql = 'SELECT g.group_id, g.group_name, g.group_type + $sql = 'SELECT g.group_id, g.group_name, g.group_type, g.group_colour FROM ' . GROUPS_TABLE . ' g ORDER BY g.group_type ASC, g.group_name'; $result = $db->sql_query($sql); @@ -985,6 +985,7 @@ class acp_groups 'S_GROUP_SPECIAL' => ($row['group_type'] == GROUP_SPECIAL) ? true : false, 'GROUP_NAME' => $group_name, + 'GROUP_COLOR' => $row['group_colour'], 'TOTAL_MEMBERS' => $row['total_members'], 'PENDING_MEMBERS' => $row['pending_members'] )); |