diff options
| author | Mario <mario@mariovavti.com> | 2021-01-13 09:50:53 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-01-13 09:50:53 +0000 |
| commit | 5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a (patch) | |
| tree | 7521f4800e393538d19c393c6f495ea2d41cbf5a /Zotlabs/Zot6/Zot6Handler.php | |
| parent | 0bc4c7d1a0e4348018e533be600ad1c648fd97fb (diff) | |
| parent | 4d2bcbc5837a7d99dc541595ca8087c335242af0 (diff) | |
| download | volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.tar.gz volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.tar.bz2 volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.zip | |
Merge branch '5.2RC'5.2
Diffstat (limited to 'Zotlabs/Zot6/Zot6Handler.php')
| -rw-r--r-- | Zotlabs/Zot6/Zot6Handler.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zotlabs/Zot6/Zot6Handler.php b/Zotlabs/Zot6/Zot6Handler.php index d717b147b..bd321c4b1 100644 --- a/Zotlabs/Zot6/Zot6Handler.php +++ b/Zotlabs/Zot6/Zot6Handler.php @@ -226,18 +226,18 @@ class Zot6Handler implements IHandler { if ($recipients) { // basically this means "unfriend" foreach ($recipients as $recip) { - $r = q("select channel.*,xchan.* from channel + $channel = q("select channel.*,xchan.* from channel left join xchan on channel_hash = xchan_hash where channel_hash = '%s' limit 1", dbesc($recip) ); - if ($r) { - $r = q("select abook_id from abook where uid = %d and abook_xchan = '%s' limit 1", - intval($r[0]['channel_id']), + if ($channel) { + $abook = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' limit 1", + intval($channel[0]['channel_id']), dbesc($sender) ); - if ($r) { - contact_remove($r[0]['channel_id'],$r[0]['abook_id']); + if ($abook) { + contact_remove($channel[0]['channel_id'],$abook[0]['abook_id']); } } } |