Merge pull request #472 from milkyway-git/patch-2

Check for mail address when checking forgotten password
thebuggenie · Nov 15, 2016 · 8929126 · 8929126
2 parents 132931c + 1fbcd73
commit 8929126
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/modules/mailing/controllers/Main.php b/modules/mailing/controllers/Main.php
@@ -21,10 +21,15 @@ public function runForgot(framework\Request $request)
 
             try
             {
-                $username = str_replace('%2E', '.', $request['forgot_password_username']);
-                if (!empty($username))
+                $username_or_email = str_replace('%2E', '.', $request['forgot_password_username']);
+                if (!empty($username_or_email))
                 {
-                    if (($user = \thebuggenie\core\entities\User::getByUsername($username)) instanceof \thebuggenie\core\entities\User)
+                    $user = \thebuggenie\core\entities\User::getByUsername($username_or_email);
+                    if (!$user instanceof \thebuggenie\core\entities\User)
+                    {
+                        $user = \thebuggenie\core\entities\User::getByEmail($username_or_email);
+                    }
+                    if ($user instanceof \thebuggenie\core\entities\User)
                     {
                         if ($user->isActivated() && $user->isEnabled() && !$user->isDeleted())
                         {