Add an extra check here

datune · Oct 2, 2017 · 90ad8c8 · 90ad8c8
1 parent a9c5c87
commit 90ad8c8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Auth/Models/User.php b/src/Auth/Models/User.php
@@ -223,8 +223,9 @@ public function getActivationCode()
  */
  public function attemptActivation($activationCode)
  {
- if ($this->is_activated)
+ if ($this->is_activated) {
  throw new Exception('User is already active!');
+ }
 
  if ($activationCode == $this->activation_code) {
  $this->activation_code = null;
@@ -269,6 +270,10 @@ public function getResetPasswordCode()
  */
  public function checkResetPasswordCode($resetCode)
  {
+ if (!$resetCode || !$this->reset_password_code) {
+ return false;
+ }
+
  return ($this->reset_password_code == $resetCode);
  }