From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 23:46:24 +0000 (-0800)
Subject: Ticket #3076: fix regression in password recovery when email address given that doesn... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e74590d41465b691cc49f4ae50fc9d9013293a91;p=quix0rs-gnu-social.git

Ticket #3076: fix regression in password recovery when email address given that doesn't match

Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
---

diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 9019d6fb22..a73872bfdb 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -282,7 +282,11 @@ class RecoverpasswordAction extends Action
         $user = User::staticGet('email', common_canonical_email($nore));
 
         if (!$user) {
-            $user = User::staticGet('nickname', common_canonical_nickname($nore));
+            try {
+                $user = User::staticGet('nickname', common_canonical_nickname($nore));
+            } catch (NicknameException $e) {
+                // invalid
+            }
         }
 
         # See if it's an unconfirmed email address