Merge branch 'main' into fix-4162

OpenMage · Sep 25, 2024 · 7109017 · 7109017
2 parents 3d3ca77 + 4ddd7fb
commit 7109017
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -932,7 +932,7 @@ protected function _validateResetPasswordLinkToken($customerId, $resetPasswordLi
         }
 
         $customerToken = $customer->getRpToken();
-        if (strcmp($customerToken, $resetPasswordLinkToken) != 0 || $customer->isResetPasswordLinkTokenExpired()) {
+        if (is_null($customerToken) || strcmp($customerToken, $resetPasswordLinkToken) !== 0 || $customer->isResetPasswordLinkTokenExpired()) {
             throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Your password reset link has expired.'));
         }
     }