diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-19 16:27:24 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-19 16:27:24 -0700 |
| commit | cdb1bc9be6fbc09caff62c0153386cc58a2bfbd9 (patch) | |
| tree | 2069795706e4d54b740ee5ef6d8469c75d331b34 /include/connections.php | |
| parent | 656ec585b22e62b496fe96002ee8ca7f9fd02d64 (diff) | |
| parent | 52183f8bf85777068839490c37a882191f216fe4 (diff) | |
| download | volse-hubzilla-cdb1bc9be6fbc09caff62c0153386cc58a2bfbd9.tar.gz volse-hubzilla-cdb1bc9be6fbc09caff62c0153386cc58a2bfbd9.tar.bz2 volse-hubzilla-cdb1bc9be6fbc09caff62c0153386cc58a2bfbd9.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/connections.php')
| -rw-r--r-- | include/connections.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/connections.php b/include/connections.php index 0cf4cdc5a..60bce018e 100644 --- a/include/connections.php +++ b/include/connections.php @@ -369,7 +369,8 @@ function contact_remove($channel_id, $abook_id) { return false; - $r = q("select * from item where author_xchan = '%s' and uid = %d", + $r = q("select * from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d", + dbesc($abook['abook_xchan']), dbesc($abook['abook_xchan']), intval($channel_id) ); |