Skip to content

Commit

Permalink
Fix #346 - age bracket keyword in mail merge
Browse files Browse the repository at this point in the history
  • Loading branch information
tbar0970 committed Mar 28, 2017
1 parent d54d1ab commit 4f235a4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion db_objects/person.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ static function getCustomMergeData($personids)
function getInstancesQueryComps($params, $logic, $order)
{
$res = parent::getInstancesQueryComps($params, $logic, $order);
$res['select'][] = 'f.family_name, f.address_street, f.address_suburb, f.address_state, f.address_postcode, f.home_tel, c.name as congregation';
$res['select'][] = 'f.family_name, f.address_street, f.address_suburb, f.address_state, f.address_postcode, f.home_tel, c.name as congregation, ab.label as age_bracket';
$res['from'] = '(('.$res['from'].')
JOIN family f ON person.familyid = f.id)
LEFT JOIN congregation c ON person.congregationid = c.id
Expand Down

0 comments on commit 4f235a4

Please sign in to comment.