DigitaleAgentur___ALT
/
registration
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #274 from nextcloud/bugfix/267/catch-exception-when-email-is-not-configured 

Catch exception when email is not configured
This commit is contained in:
Joas Schilling 2021-02-23 08:25:01 +01:00 committed by GitHub
parent 8ed9bfc551 77c67a02d0
commit 18c8d3995d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Controller/RegisterController.php
View File

@ -143,6 +143,8 @@ class RegisterController extends Controller {
$this->mailService->sendTokenByMail($registration); $this->mailService->sendTokenByMail($registration);
} catch (RegistrationException $e) { } catch (RegistrationException $e) {
return $this->showEmailForm($email, $e->getMessage()); return $this->showEmailForm($email, $e->getMessage());
} catch (\Exception $e) {
return $this->showEmailForm($email, $this->l10n->t('A problem occurred sending email, please contact your administrator.'));
} }
return new RedirectResponse( return new RedirectResponse(
@ -222,7 +224,7 @@ class RegisterController extends Controller {
} catch (RegistrationException $e) { } catch (RegistrationException $e) {
return $this->validateSecretAndTokenErrorPage(); return $this->validateSecretAndTokenErrorPage();
} }
$additional_hint = $this->config->getAppValue('registration', 'additional_hint'); $additional_hint = $this->config->getAppValue('registration', 'additional_hint');
return new TemplateResponse('registration', 'form/user', [ return new TemplateResponse('registration', 'form/user', [