Merge branch 'master' into develop

2018-03-23 06:15:55 -04:00
parent 046046e0c4 bacc5de3a2
commit 27d94023ee
70 changed files with 27138 additions and 26508 deletions
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -395,7 +395,7 @@ class User
 			throw new Exception(L10n::t('Not a valid email address.'));
 		}

-		if (dba::exists('user', ['email' => $email])) {
+		if (Config::get('system', 'block_extended_register', false) && dba::exists('user', ['email' => $email])) {
 			throw new Exception(L10n::t('Cannot use that email.'));
 		}