From 03585b8f885c7c7482cb58b277af187151dc0887 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 6 Oct 2014 19:37:51 -0700
Subject: SQL error - private message conversation lookup

---
 include/message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/message.php')

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)
-- 
cgit v1.2.3