aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_email.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-04-29 01:18:57 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-04-29 01:18:57 +0000
commit7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c (patch)
tree9dc3802635b2309fa5f8cb96e46ac5cae4a88b00 /phpBB/includes/acp/acp_email.php
parent656274cd5798ef9e62c23cdf0c3c1d66d612263d (diff)
downloadforums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar.gz
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar.bz2
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar.xz
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.zip
- fixing some bugs, containing fixes for anonymous username displays, eaccelerator issue, permission trace and a few smaller bugs.
git-svn-id: file:///svn/phpbb/trunk@5858 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_email.php')
-rw-r--r--phpBB/includes/acp/acp_email.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 1d3149c958..4d254bb084 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -194,14 +194,16 @@ class acp_email
}
}
- // Initial selection
- $sql = 'SELECT group_id, group_type, group_name
- FROM ' . GROUPS_TABLE . '
- ORDER BY group_type DESC, group_name ASC';
+ // Exclude bots...
+ $sql = 'SELECT group_id
+ FROM ' . GROUPS_TABLE . "
+ WHERE group_name = 'BOTS'";
$result = $db->sql_query($sql);
+ $bot_group_id = (int) $db->sql_fetchfield('group_id');
+ $db->sql_freeresult($result);
$select_list = '<option value="0"' . ((!$group_id) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_USERS'] . '</option>';
- $select_list .= group_select_options($group_id);
+ $select_list .= group_select_options($group_id, array($bot_group_id));
$s_priority_options = '<option value="' . MAIL_LOW_PRIORITY . '">' . $user->lang['MAIL_LOW_PRIORITY'] . '</option>';
$s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . $user->lang['MAIL_NORMAL_PRIORITY'] . '</option>';