Fix reactiving of soft-deleted users

The deactivate user action soft-deletes users in the DB. This allows the `attemptActivation()` method to restore users who were deactivated this way. Fixes #382.
rainlab · Jun 22, 2019 · 9edc955 · LukeTowers · Sep 2, 2019 · bennothommo
1 parent e742c57
commit 9edc955
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/models/User.php b/models/User.php
@@ -75,9 +75,18 @@ class User extends UserBase
      */
     public function attemptActivation($code)
     {
-        $result = parent::attemptActivation($code);
-        if ($result === false) {
-            return false;
+        if ($this->trashed()) {
+            if ($code == $this->activation_code) {
+                $this->restore();
+            } else {
+                return false;
+            }
+        } else {
+            $result = parent::attemptActivation($code);
+
+            if ($result === false) {
+                return false;
+            }
         }
 
         Event::fire('rainlab.user.activate', [$this]);