diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-09-19 11:23:38 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-09-19 11:23:38 +0200 |
| commit | ec7cbe272af07d184f8ecd5d2285bb8f31d2d9a4 (patch) | |
| tree | 8c15ce5b6ab6de0d6c8d304084eed67c037f8811 /include/message.php | |
| parent | 71c599f50ef2933f3898d55823aec351f95d5828 (diff) | |
| parent | 98bc1ed600639a8edff78795d8e71019d9dddd18 (diff) | |
| download | volse-hubzilla-ec7cbe272af07d184f8ecd5d2285bb8f31d2d9a4.tar.gz volse-hubzilla-ec7cbe272af07d184f8ecd5d2285bb8f31d2d9a4.tar.bz2 volse-hubzilla-ec7cbe272af07d184f8ecd5d2285bb8f31d2d9a4.zip | |
Merge remote-tracking branch 'mike/master' into dev
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; } |