diff options
| author | redmatrix <git@macgirvin.com> | 2016-01-10 17:39:18 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-01-10 17:39:18 -0800 |
| commit | d79d6c70558d77e76ee298258dce003b933c672f (patch) | |
| tree | 0359a7596d3e27bd42274b966cd5c20febba3f30 | |
| parent | 23c7086605d54fc6d9a537b20fc3377a52b24ee8 (diff) | |
| download | volse-hubzilla-d79d6c70558d77e76ee298258dce003b933c672f.tar.gz volse-hubzilla-d79d6c70558d77e76ee298258dce003b933c672f.tar.bz2 volse-hubzilla-d79d6c70558d77e76ee298258dce003b933c672f.zip | |
the mail_isreply flag wasn't being set in the right cases
| -rw-r--r-- | include/message.php | 9 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/message.php b/include/message.php index 940fcc275..f24bb6e4b 100644 --- a/include/message.php +++ b/include/message.php @@ -11,6 +11,7 @@ require_once('include/attach.php'); function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='',$expires = ''){ $ret = array('success' => false); + $is_reply = false; $a = get_app(); $observer_hash = get_observer_hash(); @@ -51,6 +52,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' $conv_guid = ''; if(strlen($replyto)) { + $is_reply = true; $r = q("select conv_guid from mail where channel_id = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1", intval(local_channel()), dbesc($replyto), @@ -187,8 +189,8 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' - $r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, title, body, attach, mid, parent_mid, created, expires ) - VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", + $r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, title, body, attach, mid, parent_mid, created, expires, mail_isreply ) + VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )", intval($channel['channel_account_id']), dbesc($conv_guid), intval(1), @@ -201,7 +203,8 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' dbesc($mid), dbesc($replyto), dbesc(datetime_convert()), - dbescdate($expires) + dbescdate($expires), + intval($is_reply) ); // verify the save diff --git a/version.inc b/version.inc index 5793fa135..3641bf5e9 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-09.1273H +2016-01-10.1274H |