diff options
| -rw-r--r-- | core/Command/Maintenance/Install.php | 4 | ||||
| -rw-r--r-- | lib/private/Setup.php | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index 3e6ee2a463f..39692e036ba 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -171,6 +171,10 @@ class Install extends Command { $adminPassword = $helper->ask($input, $output, $question); } + if ($adminEmail !== null && !filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) { + throw new InvalidArgumentException('Invalid e-mail-address <' . $adminEmail . '> for <' . $adminLogin . '>.'); + } + $options = [ 'dbtype' => $db, 'dbuser' => $dbUser, diff --git a/lib/private/Setup.php b/lib/private/Setup.php index 9346edd8363..e9719705fcd 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -416,12 +416,7 @@ class Setup { // Set email for admin if (!empty($options['adminemail'])) { - $adminEmail = htmlspecialchars_decode($options['adminemail']); - if (filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) { - $config->setUserValue($user->getUID(), 'settings', 'email', $adminEmail); - } else { - $error[] = "Invalid e-mail-address <$adminEmail> for <$username>."; - } + $config->setUserValue($user->getUID(), 'settings', 'email', $options['adminemail']); } } |