aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/ucp/controller/reset_password.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-08-10 21:18:55 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-08-10 21:18:55 +0200
commitfa5a0d5e210646d0d271f5ed7433e4cc028b5cf1 (patch)
tree27b1efc9afb537d86abb4391883c974fcd52f948 /phpBB/phpbb/ucp/controller/reset_password.php
parentcefdf8bf19d764b7fef3d04383a41ed856af5503 (diff)
downloadforums-fa5a0d5e210646d0d271f5ed7433e4cc028b5cf1.tar
forums-fa5a0d5e210646d0d271f5ed7433e4cc028b5cf1.tar.gz
forums-fa5a0d5e210646d0d271f5ed7433e4cc028b5cf1.tar.bz2
forums-fa5a0d5e210646d0d271f5ed7433e4cc028b5cf1.tar.xz
forums-fa5a0d5e210646d0d271f5ed7433e4cc028b5cf1.zip
[ticket/11327] Update tests to reflect changes
PHPBB3-11327
Diffstat (limited to 'phpBB/phpbb/ucp/controller/reset_password.php')
-rw-r--r--phpBB/phpbb/ucp/controller/reset_password.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php
index c686f198c5..679c659eb0 100644
--- a/phpBB/phpbb/ucp/controller/reset_password.php
+++ b/phpBB/phpbb/ucp/controller/reset_password.php
@@ -220,7 +220,7 @@ class reset_password
}
// Do not create multiple valid reset tokens
- if (!empty($user_row['reset_token']) && (int) $user_row['reset_token_expiration'] <= (time() + $this->config['reset_token_lifetime']))
+ if (!empty($user_row['reset_token']) && (int) $user_row['reset_token_expiration'] >= time())
{
trigger_error($message);
}
@@ -239,7 +239,7 @@ class reset_password
$sql_ary = [
'reset_token' => $reset_token,
- 'reset_token_expiration' => time() + $this->config['reset_token_lifetime'],
+ 'reset_token_expiration' => strtotime('+1 day'),
];
$sql = 'UPDATE ' . $this->tables['users'] . '