Apply suggestions from code review

Co-authored-by: Stefan Giehl <stefan@matomo.org>
matomo-org · Oct 24, 2024 · 29cf4a9 · 29cf4a9
1 parent 10bc11c
commit 29cf4a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/plugins/Login/PasswordResetter.php b/plugins/Login/PasswordResetter.php
@@ -176,7 +176,6 @@ public function cancelPasswordResetProcess(string $login, string $resetToken): v
     {
         $this->checkValidConfirmPasswordToken($login, $resetToken);
 
-        $resetInfo = $this->getPasswordResetInfo($login);
         $user = self::getUserInformation($login);
 
         $this->removePasswordResetInfo($login);
@@ -514,7 +513,7 @@ private function sendEmailProcessCancelled(array $user): void
             $mail->setDefaultFromPiwik();
         }
 
-        @$mail->send();
+        $mail->safeSend();
     }
 
     /**

diff --git a/plugins/Login/lang/en.json b/plugins/Login/lang/en.json
@@ -80,7 +80,7 @@
         "AcceptTermsAndCondition": "You need to accept the terms &amp; conditions.",
         "AcceptPrivacyPolicyAndTermsAndCondition": "You need to accept the privacy policy and the terms &amp; conditions.",
         "CreatePasswordDescription": "Make sure you remember this password and keep it in a safe place.",
-        "CancelPasswordResetRequestRemoved": "Your request has been removed",
+        "CancelPasswordResetRequestRemoved": "The request has been removed",
         "CancelPasswordResetRequestRemovedMessage": "We have recorded that you did not request this password reset. The reset request has been removed, and no changes have been made to your account.",
         "CancelPasswordResetSecurityTip": "For added protection, we recommend enabling two-factor authentication (2FA).",
         "SecurityTip": "Security Tip"