diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-24 09:23:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-24 09:23:25 +0200 |
| commit | 5c063cf7c997d3cf198218763702eba9c38230af (patch) | |
| tree | 6af5aed5bb14406dbb0f873d60190e3d5f122e4d /core | |
| parent | adcf942901fd567d97dbe105e8f3dfb7cea738e3 (diff) | |
| download | nextcloud-server-5c063cf7c997d3cf198218763702eba9c38230af.tar.gz nextcloud-server-5c063cf7c997d3cf198218763702eba9c38230af.zip | |
Allow opening the password reset link in a new window when its a URL
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/LoginController.php | 3 | ||||
| -rw-r--r-- | core/templates/login.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index ea857bb57df..2c7b7faed6f 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -135,7 +135,8 @@ class LoginController extends Controller { } $parameters['canResetPassword'] = true; - if (!$this->config->getSystemValue('lost_password_link')) { + $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', ''); + if (!$parameters['resetPasswordLink']) { if (!is_null($user) && $user !== '') { $userObj = $this->userManager->get($user); if ($userObj instanceof IUser) { diff --git a/core/templates/login.php b/core/templates/login.php index 45814fc71d9..5b0fd97cfd8 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -57,7 +57,7 @@ script('core', [ </p> <?php if (!empty($_['invalidpassword']) && !empty($_['canResetPassword'])) { ?> - <a id="lost-password" class="warning" href=""> + <a id="lost-password" class="warning" href="<?php p($_['resetPasswordLink']); ?>"> <?php p($l->t('Wrong password. Reset it?')); ?> </a> <?php } else if (!empty($_['invalidpassword'])) { ?> |