diff options
| author | Mario <mario@mariovavti.com> | 2021-01-03 20:17:45 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-01-03 20:17:45 +0000 |
| commit | 6999b8d9b45584c0db82f8fcc6bf3b1212daa3c6 (patch) | |
| tree | e325816e692c203de5f9baca11533fee8939ec5e | |
| parent | cff5859c595ae3d758072b11aa60190e210cb490 (diff) | |
| download | volse-hubzilla-6999b8d9b45584c0db82f8fcc6bf3b1212daa3c6.tar.gz volse-hubzilla-6999b8d9b45584c0db82f8fcc6bf3b1212daa3c6.tar.bz2 volse-hubzilla-6999b8d9b45584c0db82f8fcc6bf3b1212daa3c6.zip | |
fix no channel_id provided for contact_remove() in reply_purge(). fix wrong notifier command
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Zot6/Zot6Handler.php | 12 | ||||
| -rw-r--r-- | include/connections.php | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 972ebe0e9..4291ce518 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -421,7 +421,7 @@ class Libzot { if($new_connection) { if(! Permissions::PermsCompare($new_perms,$previous_perms)) - Master::Summon([ 'Notifier', 'permissions_create', $new_connection[0]['abook_id'] ]); + Master::Summon([ 'Notifier', 'permission_create', $new_connection[0]['abook_id'] ]); Enotify::submit( [ 'type' => NOTIFY_INTRO, 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']); } } } diff --git a/include/connections.php b/include/connections.php index bd41e112e..99a4cc71e 100644 --- a/include/connections.php +++ b/include/connections.php @@ -357,7 +357,7 @@ function contact_remove($channel_id, $abook_id) { call_hooks('connection_remove',$x); - $archive = get_pconfig($channel_id, 'system','archive_removed_contacts'); + $archive = get_pconfig($channel_id, 'system', 'archive_removed_contacts'); if($archive) { q("update abook set abook_archived = 1 where abook_id = %d and abook_channel = %d", intval($abook_id), |