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/message.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/message.php')
| -rw-r--r-- | include/message.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/message.php b/include/message.php index 4a673b961..936c01631 100644 --- a/include/message.php +++ b/include/message.php @@ -4,6 +4,7 @@ require_once('include/crypto.php'); require_once('include/attach.php'); +require_once('include/msglib.php'); function mail_prepare_binary($item) { @@ -498,11 +499,8 @@ function private_messages_drop($channel_id, $messageitem_id, $drop_conversation } else { xchan_mail_query($x[0]); - $x[0]['mail_deleted'] = true; - $r = q("DELETE FROM mail WHERE id = %d AND channel_id = %d", - intval($messageitem_id), - intval($channel_id) - ); + $x[0]['mail_deleted'] = true; + msg_drop($messageitem_id, $channel_id, $x[0]['conv_guid']); build_sync_packet($channel_id,array('mail' => array(encode_mail($x,true)))); return true; } |