Merge pull request #4547 from annando/multiple-accounts

Fix: Multiple accounts per mail address are allowed

diff --git a/src/Model/User.php b/src/Model/User.php
index 702e815e601aa268ee0f2dee8feba8ced4c64428..a253865c2331a903cb1684411fc591308184c55a 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -382,7 +382,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.'));
                }