diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-07 16:13:22 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-07 16:13:22 -0700 |
| commit | c01a9839577a5fc3a8965713e206616edc586c74 (patch) | |
| tree | c9aa6cf42c2146bf5cee0a11a37ba6c93ef401d3 /include/message.php | |
| parent | 6b40c2cd090d1c406b3e1cd7ad135baff21bfd54 (diff) | |
| parent | d94f6f7c53fbb01a76a6d3beb14968d02ebb3afa (diff) | |
| download | volse-hubzilla-c01a9839577a5fc3a8965713e206616edc586c74.tar.gz volse-hubzilla-c01a9839577a5fc3a8965713e206616edc586c74.tar.bz2 volse-hubzilla-c01a9839577a5fc3a8965713e206616edc586c74.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/message.php')
| -rw-r--r-- | include/message.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/message.php b/include/message.php index 88cfb7ba2..b063530d6 100644 --- a/include/message.php +++ b/include/message.php @@ -50,7 +50,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' // look for any existing conversation structure if(strlen($replyto)) { - $r = q("select convid from mail where uid = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1", + $r = q("select convid from mail where channel_id = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1", intval(local_user()), dbesc($replyto), dbesc($replyto) |