Fix wrong check for result from query in password reset controller

NNTmux · Sep 10, 2018 · 4ebccb3 · 4ebccb3
1 parent 911438a
commit 4ebccb3
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 25 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,5 @@
+2018-09-10 DariusIII
+	* Fix: Fix wrong check for result from query in password reset controller
 2018-09-09 DariusIII
 	* Chg: Update filp/whoops to version 2.2.1
 2018-09-08 DariusIII

diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -42,14 +42,19 @@ public function __construct()
         $this->middleware('guest');
     }
 
+    /**
+     * @param \Illuminate\Http\Request $request
+     *
+     * @throws \Exception
+     */
     public function reset(Request $request)
     {
         if (! $request->has('guid')) {
             app('smarty.view')->assign('error', 'No reset code provided.');
         }
 
         $ret = User::getByPassResetGuid($request->input('guid'));
-        if (! $ret) {
+        if ($ret === null) {
             app('smarty.view')->assign('error', 'Bad reset code provided.');
         }
 

diff --git a/composer.lock b/composer.lock