diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-31 10:12:30 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-31 10:12:30 +0200 |
| commit | 235f03da646032629ae1fb31d307a5f5c99ad2a0 (patch) | |
| tree | 9e8d045171f92141f25415661b6ea1e63326dc60 /core | |
| parent | a441220f2439b00e39edb74bdace693b729b11ac (diff) | |
| parent | 5c063cf7c997d3cf198218763702eba9c38230af (diff) | |
| download | nextcloud-server-235f03da646032629ae1fb31d307a5f5c99ad2a0.tar.gz nextcloud-server-235f03da646032629ae1fb31d307a5f5c99ad2a0.zip | |
Merge pull request #24795 from owncloud/issue-24789-reset-password-link-new-window
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 eceed11435c..39e1019abe7 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -134,7 +134,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'])) { ?> |