Merge branch '6.2RC'6.2

1 files changed, 2 insertions, 15 deletions

diff --git a/include/connections.php b/include/connections.php
index a1b27e301..59020051c 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -294,21 +294,15 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) {
 				drop_item($rr,false);
 			}
 		}
+
 		$r = q("delete from event where event_xchan = '%s'",
 			dbesc($xchan)
 		);
+
 		$r = q("delete from pgrp_member where xchan = '%s'",
 			dbesc($xchan)
 		);
 
-		// Cannot delete just one side of the conversation since we do not allow
-		// you to block private mail replies. This would leave open a gateway for abuse.
-		// Both participants are owners of the conversation and both can remove it.
-
-		$r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' )",
-			dbesc($xchan),
-			dbesc($xchan)
-		);
 		$r = q("delete from xlink where ( xlink_xchan = '%s' or xlink_link = '%s' )",
 			dbesc($xchan),
 			dbesc($xchan)
@@ -318,7 +312,6 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) {
 			dbesc($xchan)
 		);
 
-
 		if($dirmode === false || $dirmode == DIRECTORY_MODE_NORMAL) {
 
 			$r = q("delete from xchan where xchan_hash = '%s'",
@@ -440,12 +433,6 @@ function contact_remove($channel_id, $abook_id) {
 		intval($channel_id)
 	);
 
-	$r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' ) and channel_id = %d ",
-		dbesc($abook['abook_xchan']),
-		dbesc($abook['abook_xchan']),
-		intval($channel_id)
-	);
-
 	$r = q("delete from abconfig where chan = %d and xchan = '%s'",
 		intval($channel_id),
 		dbesc($abook['abook_xchan'])