diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-10-20 11:34:57 -0400 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-10-20 11:34:57 -0400 |
| commit | 7aa639f050833a6e563a9c13ae19f831988555fc (patch) | |
| tree | ef7b5a550f5cc43f340760b52bc7b64cb6b1c526 /phpBB/includes | |
| parent | c4ff772c911aa79abe41275c5cba4736763ea0c4 (diff) | |
| parent | a478063d2b330f8b285fee3b7408a0eb42ec3622 (diff) | |
| download | forums-7aa639f050833a6e563a9c13ae19f831988555fc.tar forums-7aa639f050833a6e563a9c13ae19f831988555fc.tar.gz forums-7aa639f050833a6e563a9c13ae19f831988555fc.tar.bz2 forums-7aa639f050833a6e563a9c13ae19f831988555fc.tar.xz forums-7aa639f050833a6e563a9c13ae19f831988555fc.zip | |
Merge pull request #5379 from senky/ticket/15621
[ticket/15621] Remove graphical inconsistencies
Diffstat (limited to 'phpBB/includes')
| -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 cc796d766b..bc59d8ca86 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); } |