From d337cc6618889d031c920985fc3e05ed1b1e5f89 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 2 Oct 2015 22:53:51 +0200 Subject: private mail: $preid should be abook_xchan not abook_id --- mod/mail.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mod') diff --git a/mod/mail.php b/mod/mail.php index 54663b3ae..0f905f1da 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -185,20 +185,20 @@ function mail_content(&$a) { $a->page['htmlhead'] .= $header; - $preselect = (isset($a->argv[2])?array($a->argv[2]):false); $prename = $preurl = $preid = ''; - + if(x($_REQUEST,'hash')) { $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s' limit 1", intval(local_channel()), dbesc($_REQUEST['hash']) ); + if($r) { $prename = $r[0]['xchan_name']; $preurl = $r[0]['xchan_url']; - $preid = $r[0]['abook_id']; + $preid = $r[0]['abook_xchan']; $preselect = array($preid); } } @@ -213,7 +213,7 @@ function mail_content(&$a) { if($r) { $prename = $r[0]['xchan_name']; $preurl = $r[0]['xchan_url']; - $preid = $r[0]['abook_id']; + $preid = $r[0]['abook_xchan']; } } -- cgit v1.2.3