mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-14 19:45:21 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander 2018-01-24 19:09:29 +01:00
commit ef6b6b156d
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/acp_groups.html
View File

@ -316,7 +316,7 @@
<tbody> <tbody>
<!-- ELSE --> <!-- ELSE -->
<tr> <tr>
<td><strong>{groups.GROUP_NAME}</strong></td> <td><strong<!-- IF groups.GROUP_COLOR --> style="color: #{groups.GROUP_COLOR}"<!-- ENDIF -->>{groups.GROUP_NAME}</strong></td>
<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td> <td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
<td style="text-align: center;">{groups.PENDING_MEMBERS}</td> <td style="text-align: center;">{groups.PENDING_MEMBERS}</td>
<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td> <td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>

3
phpBB/includes/acp/acp_groups.php
View File

@ -926,7 +926,7 @@ class acp_groups
); );
// Get us all the 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 FROM ' . GROUPS_TABLE . ' g
ORDER BY g.group_type ASC, g.group_name'; ORDER BY g.group_type ASC, g.group_name';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -985,6 +985,7 @@ class acp_groups
'S_GROUP_SPECIAL' => ($row['group_type'] == GROUP_SPECIAL) ? true : false, 'S_GROUP_SPECIAL' => ($row['group_type'] == GROUP_SPECIAL) ? true : false,
'GROUP_NAME' => $group_name, 'GROUP_NAME' => $group_name,
'GROUP_COLOR' => $row['group_colour'],
'TOTAL_MEMBERS' => $row['total_members'], 'TOTAL_MEMBERS' => $row['total_members'],
'PENDING_MEMBERS' => $row['pending_members'] 'PENDING_MEMBERS' => $row['pending_members']
)); ));