Update app/code/core/Mage/Customer/controllers/AccountController.php

kiatng · sreichel · web-flow · commit 0f656464c48b · 2024-09-23T13:35:13.000+08:00
Co-authored-by: Sven Reichel &lt;github-sr@hotmail.com&gt;
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -931,8 +931,8 @@ protected function _validateResetPasswordLinkToken($customerId, $resetPasswordLi
             throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Wrong customer account specified.'));
         }
 
-        $customerToken = (string) $customer->getRpToken();
-        if (strcmp($customerToken, $resetPasswordLinkToken) !== 0 || $customer->isResetPasswordLinkTokenExpired()) {
+        $customerToken = $customer->getRpToken();
+        if (is_null(customerToken) || strcmp($customerToken, $resetPasswordLinkToken) !== 0 || $customer->isResetPasswordLinkTokenExpired()) {
             throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Your password reset link has expired.'));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -931,8 +931,8 @@ protected function _validateResetPasswordLinkToken($customerId, $resetPasswordLi`
`931`	`931`	`throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Wrong customer account specified.'));`
`932`	`932`	`}`
`933`	`933`
`934`		`- $customerToken = (string) $customer->getRpToken();`
`935`		`- if (strcmp($customerToken, $resetPasswordLinkToken) !== 0 \|\| $customer->isResetPasswordLinkTokenExpired()) {`
	`934`	`+ $customerToken = $customer->getRpToken();`
	`935`	`+ if (is_null(customerToken) \|\| strcmp($customerToken, $resetPasswordLinkToken) !== 0 \|\| $customer->isResetPasswordLinkTokenExpired()) {`
`936`	`936`	`throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Your password reset link has expired.'));`
`937`	`937`	`}`
`938`	`938`	`}`