Skip to content

Commit 4906c5b

Browse files
committed
Merge remote-tracking branch '36798/patch-14' into comm_voted
2 parents f6e0bc3 + a110e88 commit 4906c5b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

app/code/Magento/Customer/Model/Customer.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,7 @@ public function setStore(\Magento\Store\Model\Store $store)
10261026
* Validate customer attribute values.
10271027
*
10281028
* @deprecated 100.1.0
1029+
* @see \Magento\Customer\Model\AccountManagement::validate()
10291030
* @return bool
10301031
*/
10311032
public function validate()
@@ -1286,6 +1287,8 @@ public function changeResetPasswordLinkToken($passwordLinkToken)
12861287
* Check if current reset password link token is expired
12871288
*
12881289
* @return boolean
1290+
* @deprecated
1291+
* @see \Magento\Customer\Model\AccountManagement::isResetPasswordLinkTokenExpired
12891292
*/
12901293
public function isResetPasswordLinkTokenExpired()
12911294
{
@@ -1304,12 +1307,9 @@ public function isResetPasswordLinkTokenExpired()
13041307
return true;
13051308
}
13061309

1307-
$dayDifference = floor(($currentTimestamp - $tokenTimestamp) / (24 * 60 * 60));
1308-
if ($dayDifference >= $expirationPeriod) {
1309-
return true;
1310-
}
1311-
1312-
return false;
1310+
$hourDifference = floor(($currentTimestamp - $tokenTimestamp) / (60 * 60));
1311+
1312+
return $hourDifference >= $expirationPeriod;
13131313
}
13141314

13151315
/**

0 commit comments

Comments
 (0)