mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24921 from owncloud/stable9-backport-24795 

[9.0] Allow opening the password reset link in a new window when …
This commit is contained in:
Vincent Petry 2016-06-02 15:31:36 +02:00
parent 4eb87be488 69e54bde1f
commit 7f3bfeffe2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/login.php
View File

@ -57,7 +57,7 @@ script('core', [
</p> </p>
<?php if (!empty($_['invalidpassword']) && !empty($_['canResetPassword'])) { ?> <?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?')); ?> <?php p($l->t('Wrong password. Reset it?')); ?>
</a> </a>
<?php } else if (!empty($_['invalidpassword'])) { ?> <?php } else if (!empty($_['invalidpassword'])) { ?>

3
lib/private/util.php
View File

@ -968,7 +968,8 @@ class OC_Util {
} }
$parameters['canResetPassword'] = true; $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'])) { if (isset($_REQUEST['user'])) {
$user = \OC::$server->getUserManager()->get($_REQUEST['user']); $user = \OC::$server->getUserManager()->get($_REQUEST['user']);
if ($user instanceof IUser) { if ($user instanceof IUser) {