diff options
| author | Mario <mario@mariovavti.com> | 2018-09-17 13:29:52 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-09-17 13:29:52 +0200 |
| commit | c4c1b1f5a2ab90873bf1eef31ed794d94fdd6077 (patch) | |
| tree | 83e1c816a28982e61273252b58cca26aa1a318cc /include/zot.php | |
| parent | 1455fa6bc3298ecfae4210410441bd072fd359eb (diff) | |
| parent | 12b9106fc7b91564e968ab14618f9677a4e879bb (diff) | |
| download | volse-hubzilla-c4c1b1f5a2ab90873bf1eef31ed794d94fdd6077.tar.gz volse-hubzilla-c4c1b1f5a2ab90873bf1eef31ed794d94fdd6077.tar.bz2 volse-hubzilla-c4c1b1f5a2ab90873bf1eef31ed794d94fdd6077.zip | |
Merge branch 'patch-3' into 'dev'
Save combined view while deleting or recalling first message in thread
See merge request hubzilla/core!1273
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/zot.php b/include/zot.php index b29e86dfa..e31d650d2 100644 --- a/include/zot.php +++ b/include/zot.php @@ -12,6 +12,7 @@ require_once('include/crypto.php'); require_once('include/items.php'); require_once('include/queue_fn.php'); require_once('include/perm_upgrade.php'); +require_once('include/msglib.php'); /** @@ -2331,16 +2332,13 @@ function process_mail_delivery($sender, $arr, $deliveries) { } - $r = q("select id from mail where mid = '%s' and channel_id = %d limit 1", + $r = q("select id, conv_guid from mail where mid = '%s' and channel_id = %d limit 1", dbesc($arr['mid']), intval($channel['channel_id']) ); if($r) { if(intval($arr['mail_recalled'])) { - $x = q("delete from mail where id = %d and channel_id = %d", - intval($r[0]['id']), - intval($channel['channel_id']) - ); + msg_drop($r[0]['id'], $channel['channel_id'], $r[0]['conv_guid']); $DR->update('mail recalled'); $result[] = $DR->get(); logger('mail_recalled'); |