aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorJim Wigginton <terrafrost@phpbb.com>2009-09-02 05:12:23 +0000
committerJim Wigginton <terrafrost@phpbb.com>2009-09-02 05:12:23 +0000
commit73baf42558b70acf7b2e194a84172778374a1c6e (patch)
tree2095e4069ff2921d6a4aa9b30e7123c92ecdd6fc /phpBB/includes/functions.php
parent6134b641e395f1abd0a4fc71c50470ab93dea07e (diff)
downloadforums-73baf42558b70acf7b2e194a84172778374a1c6e.tar
forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar.gz
forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar.bz2
forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar.xz
forums-73baf42558b70acf7b2e194a84172778374a1c6e.zip
Fixed bugs #43145, #44375, #44415 and #43045
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10088 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 96ecf739ed..8957633ec7 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3006,7 +3006,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
'LOGIN_EXPLAIN' => $l_explain,
'U_SEND_PASSWORD' => ($config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '',
- 'U_RESEND_ACTIVATION' => ($config['require_activation'] != USER_ACTIVATION_NONE && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
+ 'U_RESEND_ACTIVATION' => ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),