diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-01-03 09:17:06 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-01-03 09:17:06 +0000 |
| commit | 8b400703542663627590a1a5a1a874a93349393a (patch) | |
| tree | b6ec56b730e89f520b5e71c84775ce4963b458d2 | |
| parent | 335b87221c773b8a2bd3d45a04a532278ace6058 (diff) | |
| download | webtrees-8b400703542663627590a1a5a1a874a93349393a.tar.gz webtrees-8b400703542663627590a1a5a1a874a93349393a.tar.bz2 webtrees-8b400703542663627590a1a5a1a874a93349393a.zip | |
Minor tidy up. Use Objects instead of XREFs
| -rw-r--r-- | library/WT/Controller/Ancestry.php | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/library/WT/Controller/Ancestry.php b/library/WT/Controller/Ancestry.php index e20efcb3ea..f99ee8564d 100644 --- a/library/WT/Controller/Ancestry.php +++ b/library/WT/Controller/Ancestry.php @@ -133,33 +133,26 @@ class WT_Controller_Ancestry extends WT_Controller_Base { return; } // parents - $famids = $person->getChildFamilies(); - $parents = false; - $famrec = ""; - $famid = ""; - foreach ($famids as $famid=>$family) { - if (!is_null($family)) { - $famrec = $family->getGedcomRecord(); - $parents = find_parents_in_record($famrec); - if ($parents) break; - } + $family=$person->getPrimaryChildFamily(); + if (!$family && $SHOW_EMPTY_BOXES) { + $family=new WT_Family(''); } - if (($parents || $SHOW_EMPTY_BOXES) && $new && $depth>0) { + if ($family && $new && $depth>0) { // print marriage info echo "<span class=\"details1\" style=\"white-space: nowrap;\" >"; echo "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"2\" width=\"$Dindent\" border=\"0\" align=\"middle\" alt=\"\" /><a href=\"javascript: ".WT_I18N::translate('View Family')."\" onclick=\"expand_layer('sosa_".$sosa."'); return false;\" class=\"top\"><img id=\"sosa_".$sosa."_img\" src=\"".$WT_IMAGES["minus"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".WT_I18N::translate('View Family')."\" /></a> "; echo " <span class=\"person_box\"> ".($sosa*2)." </span> ".WT_I18N::translate('and'); echo " <span class=\"person_boxF\"> ".($sosa*2+1)." </span> "; - if (!empty($family)) { - $marriage = $family->getMarriage(); - if ($marriage->canShow()) $marriage->print_simple_fact(); else echo WT_I18N::translate('Private'); + $marriage = $family->getMarriage(); + if ($marriage->canShow()) { + $marriage->print_simple_fact(); } echo "</span>"; - // display parents recursively + // display parents recursively - or show empty boxes echo "<ul style=\"list-style: none; display: block;\" id=\"sosa_$sosa\">"; - $this->print_child_ascendancy($parents["HUSB"], $sosa*2, $depth-1); - $this->print_child_ascendancy($parents["WIFE"], $sosa*2+1, $depth-1); + $this->print_child_ascendancy($family->getHusbId(), $sosa*2, $depth-1); + $this->print_child_ascendancy($family->getWifeId(), $sosa*2+1, $depth-1); echo "</ul>"; } echo "</li>"; |