private mail: $preid should be abook_xchan not abook_id
This commit is contained in:
parent
3a8bff228e
commit
d337cc6618
@ -185,20 +185,20 @@ function mail_content(&$a) {
|
|||||||
|
|
||||||
$a->page['htmlhead'] .= $header;
|
$a->page['htmlhead'] .= $header;
|
||||||
|
|
||||||
|
|
||||||
$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
|
$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
|
||||||
$prename = $preurl = $preid = '';
|
$prename = $preurl = $preid = '';
|
||||||
|
|
||||||
if(x($_REQUEST,'hash')) {
|
if(x($_REQUEST,'hash')) {
|
||||||
$r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_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",
|
where abook_channel = %d and abook_xchan = '%s' limit 1",
|
||||||
intval(local_channel()),
|
intval(local_channel()),
|
||||||
dbesc($_REQUEST['hash'])
|
dbesc($_REQUEST['hash'])
|
||||||
);
|
);
|
||||||
|
|
||||||
if($r) {
|
if($r) {
|
||||||
$prename = $r[0]['xchan_name'];
|
$prename = $r[0]['xchan_name'];
|
||||||
$preurl = $r[0]['xchan_url'];
|
$preurl = $r[0]['xchan_url'];
|
||||||
$preid = $r[0]['abook_id'];
|
$preid = $r[0]['abook_xchan'];
|
||||||
$preselect = array($preid);
|
$preselect = array($preid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -213,7 +213,7 @@ function mail_content(&$a) {
|
|||||||
if($r) {
|
if($r) {
|
||||||
$prename = $r[0]['xchan_name'];
|
$prename = $r[0]['xchan_name'];
|
||||||
$preurl = $r[0]['xchan_url'];
|
$preurl = $r[0]['xchan_url'];
|
||||||
$preid = $r[0]['abook_id'];
|
$preid = $r[0]['abook_xchan'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user