From b939faf4ef11144f885e6b12970739498b13181b Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 23 Feb 2019 15:26:06 -0500
Subject: [PATCH] Add contact removal from all groups when blocked

---
 src/Model/Contact.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index d38d1cc101..bf7d806db9 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -232,6 +232,11 @@ class Contact extends BaseObject
 		}
 
 		DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+
+		if ($blocked) {
+			// Blocked contact can't be in any group
+			self::removeFromGroups($cid);
+		}
 	}
 
 	/**
@@ -2220,4 +2225,9 @@ class Contact extends BaseObject
 
 		return $redirect;
 	}
+
+	public static function removeFromGroups($contact_id)
+	{
+		return DBA::delete('group_member', ['contact-id' => $contact_id]);
+	}
 }