diff options
| author | fisharebest <fisharebest@gmail.com> | 2012-04-03 16:34:21 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2012-04-03 16:34:21 +0000 |
| commit | 3042a5fd6703ba5bd1c501849d88966954a0d374 (patch) | |
| tree | f12bbbf48f998d236eb14f12b89dfb16502865b0 /autocomplete.php | |
| parent | 1e40b3f452ab625e46a29dad4cdfadc8de80f3ba (diff) | |
| download | webtrees-3042a5fd6703ba5bd1c501849d88966954a0d374.tar.gz webtrees-3042a5fd6703ba5bd1c501849d88966954a0d374.tar.bz2 webtrees-3042a5fd6703ba5bd1c501849d88966954a0d374.zip | |
#972588 - autocomplete - family results when marriage year is not knwon
Diffstat (limited to 'autocomplete.php')
| -rw-r--r-- | autocomplete.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/autocomplete.php b/autocomplete.php index d95a114469..c7a26b07f7 100644 --- a/autocomplete.php +++ b/autocomplete.php @@ -154,7 +154,12 @@ case 'FAM': // Families, whose name contains the search terms foreach ($rows as $row) { $family=WT_Family::getInstance($row); if ($family->canDisplayName()) { - $data[]=array('value'=>$family->getXref(), 'label'=>$family->getFullName().', <i>'.$family->getMarriageYear().'</i>'); + $marriage_year=$family->getMarriageYear(); + if ($marriage_year) { + $data[]=array('value'=>$family->getXref(), 'label'=>$family->getFullName().', <i>'.$marriage_year.'</i>'); + } else { + $data[]=array('value'=>$family->getXref(), 'label'=>$family->getFullName()); + } } } echo json_encode($data); @@ -460,7 +465,12 @@ case 'IFSRO': foreach ($rows as $row) { $family=WT_Family::getInstance($row); if ($family->canDisplayName()) { - $data[]=array('value'=>$family->getXref(), 'label'=>$family->getFullName().', <i>'.$family->getMarriageYear().'</i>'); + $marriage_year=$family->getMarriageYear(); + if ($marriage_year) { + $data[]=array('value'=>$family->getXref(), 'label'=>$family->getFullName().', <i>'.$marriage_year.'</i>'); + } else { + $data[]=array('value'=>$family->getXref(), 'label'=>$family->getFullName()); + } } } // Fetch all data, regardless of privacy |