diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-10-17 15:40:03 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-10-17 15:40:03 +0200 |
| commit | 01df1d3301ab533e92e374594d8cb35692def491 (patch) | |
| tree | 02aece0323dffa60cc87c68b51defa691a50c0ef /phpBB/includes/ucp/ucp_register.php | |
| parent | 39e51e559980d239a08a59e789a1165cc2bbcfff (diff) | |
| download | forums-01df1d3301ab533e92e374594d8cb35692def491.tar forums-01df1d3301ab533e92e374594d8cb35692def491.tar.gz forums-01df1d3301ab533e92e374594d8cb35692def491.tar.bz2 forums-01df1d3301ab533e92e374594d8cb35692def491.tar.xz forums-01df1d3301ab533e92e374594d8cb35692def491.zip | |
[ticket/11863] Grey out unavailable activation methods when emails disabled
Further fall back to USER_ACTIVATION_DISABLE when emails are disabled
but evaluate it at runtime.
PHPBB3-11863
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 9a15967bae..af21a6c1ed 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'); } |