aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-10-08 14:38:44 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-10-08 14:38:44 +0000
commite8b2c4128ec285314ce6c58d3989a9c92f8a456c (patch)
treecabeaee81eb0ebff31a48cd9f914e708a32221f3 /phpBB/includes/ucp/ucp_resend.php
parent#14662 (diff)
downloadphpbb-e8b2c4128ec285314ce6c58d3989a9c92f8a456c.tar.gz
phpbb-e8b2c4128ec285314ce6c58d3989a9c92f8a456c.tar.bz2
phpbb-e8b2c4128ec285314ce6c58d3989a9c92f8a456c.zip
some tiny bugfixes
git-svn-id: file:///svn/phpbb/trunk@8155 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_resend.php')
-rw-r--r--phpBB/includes/ucp/ucp_resend.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php
index ea5e0d8b17..48176a3989 100644
--- a/phpBB/includes/ucp/ucp_resend.php
+++ b/phpBB/includes/ucp/ucp_resend.php
@@ -146,7 +146,8 @@ class ucp_resend
meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
- $message = $user->lang['ACTIVATION_EMAIL_SENT'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+ $message = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT'];
+ $message .= '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
trigger_error($message);
}