Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts:
	include/zot.php

1 files changed, 3 insertions, 4 deletions

diff --git a/include/zot.php b/include/zot.php
index 16336ad54..8a8b74860 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1637,10 +1637,9 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 			}
 		}
 
-
-		$ab = q("select abook.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d 
-			and abook_self = 0",
-			intval($channel['channel_id'])
+		$ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'",
+			intval($channel['channel_id']),
+			dbesc($arr['owner_xchan'])
 		);
 		$abook = (($ab) ? $ab[0] : null);