diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-25 15:46:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-25 15:46:20 +0000 |
| commit | 5d2bba8e7050eda4c32be610982f80a9fec2e6c3 (patch) | |
| tree | c9765964beb12aa2d8879416155c834f352d93cb /phpBB/includes/acp | |
| parent | 384e434fca827dd9f9697777ca176e4e037fccd5 (diff) | |
| download | forums-5d2bba8e7050eda4c32be610982f80a9fec2e6c3.tar forums-5d2bba8e7050eda4c32be610982f80a9fec2e6c3.tar.gz forums-5d2bba8e7050eda4c32be610982f80a9fec2e6c3.tar.bz2 forums-5d2bba8e7050eda4c32be610982f80a9fec2e6c3.tar.xz forums-5d2bba8e7050eda4c32be610982f80a9fec2e6c3.zip | |
#1232
git-svn-id: file:///svn/phpbb/trunk@5719 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 03ed3b4696..bedab7ea20 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -185,7 +185,15 @@ class acp_email } add_log('admin', 'LOG_MASS_EMAIL', $group_name); - $message = (!$errored) ? $user->lang['EMAIL_SENT'] : sprintf($user->lang['EMAIL_SEND_ERROR'], '<a href="' . $phpbb_admin_path . "index.$phpEx$SID&i=logs&mode=critical" . '">', '</a>'); + + if (!$errored) + { + $message = ($use_queue) ? $user->lang['EMAIL_SENT_QUEUE'] : $user->lang['EMAIL_SENT']; + } + else + { + $message = sprintf($user->lang['EMAIL_SEND_ERROR'], '<a href="' . $phpbb_admin_path . "index.$phpEx$SID&i=logs&mode=critical" . '">', '</a>'); + } trigger_error($message . adm_back_link($this->u_action)); } } |