diff options
| author | Jakub Senko <jakubsenko@gmail.com> | 2018-09-25 15:52:14 +0200 |
|---|---|---|
| committer | Jakub Senko <jakubsenko@gmail.com> | 2018-09-26 09:17:29 +0200 |
| commit | a478063d2b330f8b285fee3b7408a0eb42ec3622 (patch) | |
| tree | d06e2cb097daad4520506d2c530cfef748bfc05c /phpBB/includes/ucp/ucp_pm_compose.php | |
| parent | 001f32da95d4f8697ccc9a6107afc8dc68cbe48e (diff) | |
| download | forums-a478063d2b330f8b285fee3b7408a0eb42ec3622.tar forums-a478063d2b330f8b285fee3b7408a0eb42ec3622.tar.gz forums-a478063d2b330f8b285fee3b7408a0eb42ec3622.tar.bz2 forums-a478063d2b330f8b285fee3b7408a0eb42ec3622.tar.xz forums-a478063d2b330f8b285fee3b7408a0eb42ec3622.zip | |
[ticket/15621] Remove graphical inconsistencies
PHPBB3-15621
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_compose.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index f35812b90a..abdb0baf16 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -124,7 +124,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) // Add groups to PM box if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm_group')) { - $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'; if (!$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) @@ -147,7 +147,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $group_options = ''; while ($row = $db->sql_fetchrow($result)) { - $group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . $group_helper->get_name($row['group_name']) . '</option>'; + $group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '"' . ($row['group_colour'] ? ' style="color: #' . $row['group_colour'] . '"' : '') . '>' . $group_helper->get_name($row['group_name']) . '</option>'; } $db->sql_freeresult($result); } |