From 69e54bde1f065b220a9b083060c5b7c45dec6483 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 24 May 2016 09:23:25 +0200 Subject: [PATCH] Allow opening the password reset link in a new window when its a URL --- core/templates/login.php | 2 +- lib/private/util.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/templates/login.php b/core/templates/login.php index a12008295c4..57ced760088 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -57,7 +57,7 @@ script('core', [

- + t('Wrong password. Reset it?')); ?> diff --git a/lib/private/util.php b/lib/private/util.php index 894fe9aa59f..488eb8facfd 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -968,7 +968,8 @@ class OC_Util { } $parameters['canResetPassword'] = true; - if (!\OC::$server->getSystemConfig()->getValue('lost_password_link')) { + $parameters['resetPasswordLink'] = \OC::$server->getSystemConfig()->getValue('lost_password_link', ''); + if (!$parameters['resetPasswordLink']) { if (isset($_REQUEST['user'])) { $user = \OC::$server->getUserManager()->get($_REQUEST['user']); if ($user instanceof IUser) {