From 3dcf9a1df76af69818701811edaef7eea572d7cb Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 20 Jun 2013 02:03:14 -0700 Subject: bug in commentable - ambiguous abook entry --- include/text.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/text.php b/include/text.php index 71268a793..d36475484 100755 --- a/include/text.php +++ b/include/text.php @@ -1557,7 +1557,9 @@ function xchan_query(&$items,$abook = true) { if(count($arr)) { if($abook) { $chans = q("select * from xchan left join hubloc on hubloc_hash = xchan_hash left join abook on abook_xchan = xchan_hash - where xchan_hash in (" . implode(',', $arr) . ") and ( hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )"); + where abook_channel = %d and xchan_hash in (" . implode(',', $arr) . ") and ( hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )", + intval($item['uid']) + ); } else { $chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash -- cgit v1.2.3