1 files changed, 9 insertions, 1 deletions
diff --git a/models/user.php b/models/user.php
index 2832a3fb..394cf742 100644
--- a/models/user.php
+++ b/models/user.php
@@ -63,7 +63,15 @@ class User extends Base
 
     public function remove($user_id)
     {
-        return $this->db->table(self::TABLE)->eq('id', $user_id)->remove();
+        $this->db->startTransaction();
+
+        // All tasks assigned to this user will be unassigned
+        $this->db->table(Task::TABLE)->eq('owner_id', $user_id)->update(array('owner_id' => ''));
+        $this->db->table(self::TABLE)->eq('id', $user_id)->remove();
+
+        $this->db->closeTransaction();
+
+        return true;
     }
 
     public function updateSession(array $user = array())