diff options
| author | Max Kostikov <max@kostikov.co> | 2021-01-20 13:15:40 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2021-01-20 13:15:40 +0100 |
| commit | 9612a69a6448331ae3296503e97ef6ce204d9be1 (patch) | |
| tree | afae1ea1fa8c63db4c23836e0ebfe57b56b808ec /Zotlabs/Zot6/Zot6Handler.php | |
| parent | 308e94ea799b7851287fbc7635480ac13bfe3c61 (diff) | |
| parent | 08264f8d11d349bbda92233d984ad52c16c6b2d6 (diff) | |
| download | volse-hubzilla-9612a69a6448331ae3296503e97ef6ce204d9be1.tar.gz volse-hubzilla-9612a69a6448331ae3296503e97ef6ce204d9be1.tar.bz2 volse-hubzilla-9612a69a6448331ae3296503e97ef6ce204d9be1.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
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']); } } } |