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

Merge pull request #2765 from Elsensee/ticket/11863

Browse Source 
[ticket/11863] Set require_activation to none if emails are disabled
This commit is contained in:
Joas Schilling
2014-11-21 20:18:15 +01:00
parent 707a85b6c1 0ba3bd9aed
commit 973c2a9a3a
4 changed files with 78 additions and 14 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');
}