diff options
author | zotlabs <mike@macgirvin.com> | 2019-06-26 21:54:50 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2019-06-26 21:54:50 -0700 |
commit | d83ce0863abaf448b64c550999e070376fd71b71 (patch) | |
tree | a0f0b45249487bd471bcf0545dfbb23f7b871623 /include/message.php | |
parent | cf844cb27c02c3aae636eb1aa1587b1d5e3e81a0 (diff) | |
parent | 5ccef18d4e5b7901f78a11e0124c16e1c484e3bf (diff) | |
download | volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.tar.gz volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.tar.bz2 volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.zip |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/message.php')
-rw-r--r-- | include/message.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/message.php b/include/message.php index 2486beb83..7d05b9ab7 100644 --- a/include/message.php +++ b/include/message.php @@ -19,7 +19,7 @@ function mail_prepare_binary($item) { // send a private message -function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $replyto = '', $expires = NULL_DATE, $mimetype = 'text/bbcode', $raw = false) { +function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $replyto = '', $expires = NULL_DATE, $mimetype = 'text/bbcode', $raw = false, $sig = '') { $ret = array('success' => false); $is_reply = false; @@ -175,8 +175,7 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep $subject = str_rot47(base64url_encode($subject)); if(($body )&& (! $raw)) $body = str_rot47(base64url_encode($body)); - - $sig = ''; // placeholder + $mimetype = ''; //placeholder $r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, mail_mimetype, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply, mail_raw ) |