diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 20:18:15 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 20:18:15 +0100 |
| commit | 973c2a9a3aaad10ec589a9ef5e53862b1543f8f6 (patch) | |
| tree | 14453735d59644ff14843a4282ad2088326b6696 /phpBB/includes/ucp/ucp_register.php | |
| parent | 707a85b6c12db11d2f58c612b37229ec205f65fb (diff) | |
| parent | 0ba3bd9aed71a6a9eecacd9bff3ecc6a3d778057 (diff) | |
| download | forums-973c2a9a3aaad10ec589a9ef5e53862b1543f8f6.tar forums-973c2a9a3aaad10ec589a9ef5e53862b1543f8f6.tar.gz forums-973c2a9a3aaad10ec589a9ef5e53862b1543f8f6.tar.bz2 forums-973c2a9a3aaad10ec589a9ef5e53862b1543f8f6.tar.xz forums-973c2a9a3aaad10ec589a9ef5e53862b1543f8f6.zip | |
Merge pull request #2765 from Elsensee/ticket/11863
[ticket/11863] Set require_activation to none if emails are disabled
Diffstat (limited to 'phpBB/includes/ucp/ucp_register.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 88078c10af..14f6a8bc02 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -33,7 +33,8 @@ class ucp_register global $request, $phpbb_container; // - if ($config['require_activation'] == USER_ACTIVATION_DISABLE) + if ($config['require_activation'] == USER_ACTIVATION_DISABLE || + (in_array($config['require_activation'], array(USER_ACTIVATION_SELF, USER_ACTIVATION_ADMIN)) && !$config['email_enable'])) { trigger_error('UCP_REGISTER_DISABLE'); } |