diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-19 11:18:28 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-19 11:18:28 +0200 |
| commit | fa9e9510e5d993d183feb942fe74be5fdd07f5cf (patch) | |
| tree | 41fec09f527a9346e043b8099b458a97d81b03ed /include/message.php | |
| parent | 32de123db0ac526795a237ff46885fe8a332cbc0 (diff) | |
| parent | 06b3ad1071c755757555baf941e2c0f446f97b21 (diff) | |
| download | volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.gz volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.bz2 volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.zip | |
Merge branch '3.8RC'3.8
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; } |