diff options
| author | friendica <info@friendica.com> | 2013-06-20 02:03:14 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-06-20 02:03:14 -0700 |
| commit | 3dcf9a1df76af69818701811edaef7eea572d7cb (patch) | |
| tree | 4abbf680e4a9f2c9c76b8fc53f5fb3f25d0ba6f7 | |
| parent | e25a38788705310787df4115a14cf97bb4131145 (diff) | |
| download | volse-hubzilla-3dcf9a1df76af69818701811edaef7eea572d7cb.tar.gz volse-hubzilla-3dcf9a1df76af69818701811edaef7eea572d7cb.tar.bz2 volse-hubzilla-3dcf9a1df76af69818701811edaef7eea572d7cb.zip | |
bug in commentable - ambiguous abook entry
| -rwxr-xr-x | include/text.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 4 insertions, 2 deletions
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 diff --git a/version.inc b/version.inc index 6855656d4..782192371 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-19.349 +2013-06-20.350 |