mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 10:44:20 +02:00
Code Issues Releases Wiki Activity

[ticket/11863] Grey out unavailable activation methods when emails disabled

Browse Source 
Further fall back to USER_ACTIVATION_DISABLE when emails are disabled
but evaluate it at runtime.

PHPBB3-11863
This commit is contained in:
Oliver Schramm
2014-10-17 15:40:03 +02:00
parent 39e51e5599
commit 01df1d3301
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/ucp/ucp_register.php
View File

@@ -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');
}