Change fam-list function to use a variable rather than echoing every cell

9 files changed, 123 insertions, 121 deletions

diff --git a/ancestry.php b/ancestry.php
index bed6134e69..c20d546c61 100644
--- a/ancestry.php
+++ b/ancestry.php
@@ -225,7 +225,7 @@ case 3:
 		}
 	}
 	echo '<div id="ancestry-list">';
-	print_fam_table($famlist, WT_I18N::translate('Ancestors of %s', $controller->name));
+	echo format_fam_table($famlist, WT_I18N::translate('Ancestors of %s', $controller->name));
 	echo '</div>';
 	break;
 }
diff --git a/descendancy.php b/descendancy.php
index 65877a0d9c..d86c2e9948 100644
--- a/descendancy.php
+++ b/descendancy.php
@@ -147,7 +147,7 @@ case 2: //-- Individual list
 case 3: //-- Family list
 	$descendants=fam_desc($controller->descPerson, $controller->generations, array());
 	echo '<div id="descendancy-list">';
-	print_fam_table($descendants, WT_I18N::translate('Descendants of %s', $controller->name));
+	echo format_fam_table($descendants, WT_I18N::translate('Descendants of %s', $controller->name));
 	echo '</div>';
 	break;
 }
diff --git a/famlist.php b/famlist.php
index 6c92d84ff9..f6565366d7 100644
--- a/famlist.php
+++ b/famlist.php
@@ -255,7 +255,7 @@ if ($show=='indi' || $show=='surn') {
 			}
 		}
 		if ($show=='indi') {
-			print_fam_table(
+			echo format_fam_table(
 				WT_Query_Name::families($surname, $alpha, $falpha, $show_marnm, WT_GED_ID)
 			);
 		}
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index 61c33605c9..9195d957a2 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -271,7 +271,7 @@ function format_indi_table($datalist, $option='') {
 			$html .= '<a '. $title. ' href="'. $person->getHtmlUrl(). '"'. $class. '>'. highlight_search_hits($name['full']). '</a>'. $sex_image. '<br/>';
 		}
 		// Indi parents
-		$html .= $person->getPrimaryParentsNames("parents_indi_list_table_".$table_id." details1", 'none');
+		$html .= $person->getPrimaryParentsNames('parents_indi_list_table_'.$table_id.' details1', 'none');
 		$html .= '</td>';
 		// Dummy column to match colspan in header
 		$html .= '<td style="display:none;"></td>';
@@ -453,10 +453,11 @@ function format_indi_table($datalist, $option='') {
 }
 
 // print a table of families
-function print_fam_table($datalist, $option='') {
+function format_fam_table($datalist, $option='') {
 	global $GEDCOM, $SHOW_LAST_CHANGE, $WT_IMAGES, $SEARCH_SPIDER, $controller;
 	$table_id = 'ID'.floor(microtime()*1000000); // lists requires a unique ID in case there are multiple lists per page
 	if ($option=='BIRT_PLAC' || $option=='DEAT_PLAC') return;
+	$html = '';
 
 	$controller
 		->addExternalJavaScript(WT_STATIC_URL.'js/jquery/jquery.dataTables.min.js')
@@ -621,35 +622,35 @@ function print_fam_table($datalist, $option='') {
 	for ($year=1550; $year<2030; $year+=10) $birt_by_decade[$year]='';
 	for ($year=1550; $year<2030; $year+=10) $marr_by_decade[$year]='';
 	//--table wrapper
-	echo '<div class="loading-image">&nbsp;</div>';
-	echo '<div class="fam-list">';
+	$html .= '<div class="loading-image">&nbsp;</div>';
+	$html .= '<div class="fam-list">';
 	//-- table header
-	echo '<table id="', $table_id, '"><thead><tr>';
-	echo '<th>', WT_Gedcom_Tag::getLabel('GIVN'), '</th>';
-	echo '<th>', WT_Gedcom_Tag::getLabel('SURN'), '</th>';
-	echo '<th>HUSB:GIVN_SURN</th>';
-	echo '<th>HUSB:SURN_GIVN</th>';
-	echo '<th>', WT_Gedcom_Tag::getLabel('AGE'), '</th>';
-	echo '<th>AGE</th>';
-	echo '<th>', WT_Gedcom_Tag::getLabel('GIVN'), '</th>';
-	echo '<th>', WT_Gedcom_Tag::getLabel('SURN'), '</th>';
-	echo '<th>WIFE:GIVN_SURN</th>';
-	echo '<th>WIFE:SURN_GIVN</th>';
-	echo '<th>', WT_Gedcom_Tag::getLabel('AGE'), '</th>';
-	echo '<th>AGE</th>';
-	echo '<th>', WT_Gedcom_Tag::getLabel('MARR'), '</th>';
-	echo '<th>MARR:DATE</th>';
-	echo '<th><img src="', $WT_IMAGES['reminder'], '" alt="', WT_I18N::translate('Anniversary'), '" title="', WT_I18N::translate('Anniversary'), '"></th>';
-	echo '<th>', WT_Gedcom_Tag::getLabel('PLAC'), '</th>';
-	echo '<th><img src="', $WT_IMAGES['children'], '" alt="', WT_I18N::translate('Children'), '" title="', WT_I18N::translate('Children'), '"></th>';
-	echo '<th>NCHI</th>';
-	echo '<th ',($SHOW_LAST_CHANGE?'':''),'>', WT_Gedcom_Tag::getLabel('CHAN'), '</th>';
-	echo '<th>MARR</th>';
-	echo '<th>DEAT</th>';
-	echo '<th>TREE</th>';
-	echo '</tr></thead>';
+	$html .= '<table id="'. $table_id. '"><thead><tr>';
+	$html .= '<th>'. WT_Gedcom_Tag::getLabel('GIVN'). '</th>';
+	$html .= '<th>'. WT_Gedcom_Tag::getLabel('SURN'). '</th>';
+	$html .= '<th>HUSB:GIVN_SURN</th>';
+	$html .= '<th>HUSB:SURN_GIVN</th>';
+	$html .= '<th>'. WT_Gedcom_Tag::getLabel('AGE'). '</th>';
+	$html .= '<th>AGE</th>';
+	$html .= '<th>'. WT_Gedcom_Tag::getLabel('GIVN'). '</th>';
+	$html .= '<th>'. WT_Gedcom_Tag::getLabel('SURN'). '</th>';
+	$html .= '<th>WIFE:GIVN_SURN</th>';
+	$html .= '<th>WIFE:SURN_GIVN</th>';
+	$html .= '<th>'. WT_Gedcom_Tag::getLabel('AGE'). '</th>';
+	$html .= '<th>AGE</th>';
+	$html .= '<th>'. WT_Gedcom_Tag::getLabel('MARR'). '</th>';
+	$html .= '<th>MARR:DATE</th>';
+	$html .= '<th><img src="'. $WT_IMAGES['reminder']. '" alt="'. WT_I18N::translate('Anniversary'). '" title="'. WT_I18N::translate('Anniversary'). '"></th>';
+	$html .= '<th>'. WT_Gedcom_Tag::getLabel('PLAC'). '</th>';
+	$html .= '<th><img src="'. $WT_IMAGES['children']. '" alt="'. WT_I18N::translate('Children'). '" title="'. WT_I18N::translate('Children'). '"></th>';
+	$html .= '<th>NCHI</th>';
+	$html .= '<th '.($SHOW_LAST_CHANGE?'':'').'>'. WT_Gedcom_Tag::getLabel('CHAN'). '</th>';
+	$html .= '<th>MARR</th>';
+	$html .= '<th>DEAT</th>';
+	$html .= '<th>TREE</th>';
+	$html .= '</tr></thead>';
 	//-- table body
-	echo '<tbody>';
+	$html .= '<tbody>';
 	$num = 0;
 	$d100y=new WT_Date(date('Y')-100);  // 100 years ago
 	foreach ($datalist as $key => $value) {
@@ -675,9 +676,9 @@ function print_fam_table($datalist, $option='') {
 		}
 		//-- place filtering
 		if ($option=='MARR_PLAC' && strstr($family->getMarriagePlace(), $filter)===false) continue;
-		echo '<tr>';
+		$html .= '<tr>';
 		//-- Husband name(s)
-		echo '<td colspan="2">';
+		$html .= '<td colspan="2">';
 		foreach ($husb->getAllNames() as $num=>$name) {
 			if ($name['type']=='NAME') {
 				$title='';
@@ -694,23 +695,23 @@ function print_fam_table($datalist, $option='') {
 			}
 			// Only show married names if they are the name we are filtering by.
 			if ($name['type']!='_MARNM' || $num==$husb->getPrimaryName()) {
-				echo '<a ', $title, ' href="', $family->getHtmlUrl(), '"', $class. '>', highlight_search_hits($name['full']), '</a>', $sex_image, '<br/>';
+				$html .= '<a '. $title. ' href="'. $family->getHtmlUrl(). '"'. $class. '>'. highlight_search_hits($name['full']). '</a>'. $sex_image. '<br/>';
 			}
 		}
 		// Husband parents
-		echo $husb->getPrimaryParentsNames('parents_'.$table_id.' details1', 'none');
-		echo '</td>';
+		$html .= $husb->getPrimaryParentsNames('parents_'.$table_id.' details1', 'none');
+		$html .= '</td>';
 		// Dummy column to match colspan in header
-		echo '<td style="display:none;"></td>';
+		$html .= '<td style="display:none;"></td>';
 		//-- Husb GIVN
 		// Use "AAAA" as a separator (instead of ",") as JavaScript.localeCompare() ignores
 		// punctuation and "ANN,ROACH" would sort after "ANNE,ROACH", instead of before it.
 		// Similarly, @N.N. would sort as NN.
-		echo '<td>', htmlspecialchars(str_replace('@P.N.', 'AAAA', $givn)), 'AAAA', htmlspecialchars(str_replace('@N.N.', 'AAAA', $surn)), '</td>';
-		echo '<td>', htmlspecialchars(str_replace('@N.N.', 'AAAA', $surn)), 'AAAA', htmlspecialchars(str_replace('@P.N.', 'AAAA', $givn)), '</td>';
+		$html .= '<td>'. htmlspecialchars(str_replace('@P.N.', 'AAAA', $givn)). 'AAAA'. htmlspecialchars(str_replace('@N.N.', 'AAAA', $surn)). '</td>';
+		$html .= '<td>'. htmlspecialchars(str_replace('@N.N.', 'AAAA', $surn)). 'AAAA'. htmlspecialchars(str_replace('@P.N.', 'AAAA', $givn)). '</td>';
 		$mdate=$family->getMarriageDate();
 		//-- Husband age
-		echo '<td>';
+		$html .= '<td>';
 		$hdate=$husb->getBirthDate();
 		if ($hdate->isOK() && $mdate->isOK()) {
 			if ($hdate->gregorianYear()>=1550 && $hdate->gregorianYear()<2030) {
@@ -718,14 +719,14 @@ function print_fam_table($datalist, $option='') {
 			}
 			$hage=WT_Date::GetAgeYears($hdate, $mdate);
 			$hage_jd = $mdate->MinJD()-$hdate->MinJD();
-			echo WT_I18N::number($hage);
+			$html .= WT_I18N::number($hage);
 			$marr_by_age[max(0, min($max_age, $hage))] .= $husb->getSex();
 		} else {
 			$hage=0;
 		}
-		echo '</td><td>', $hage, '</td>';
+		$html .= '</td><td>'. $hage. '</td>';
 		//-- Wife name(s)
-		echo '<td colspan="2">';
+		$html .= '<td colspan="2">';
 		foreach ($wife->getAllNames() as $num=>$name) {
 			if ($name['type']=='NAME') {
 				$title='';
@@ -742,24 +743,24 @@ function print_fam_table($datalist, $option='') {
 			}
 			// Only show married names if they are the name we are filtering by.
 			if ($name['type']!='_MARNM' || $num==$wife->getPrimaryName()) {
-				echo '<a ', $title, ' href="', $family->getHtmlUrl(), '"', $class. '>', highlight_search_hits($name['full']), '</a>', $sex_image, '<br/>';
+				$html .= '<a '. $title. ' href="'. $family->getHtmlUrl(). '"'. $class. '>'. highlight_search_hits($name['full']). '</a>'. $sex_image. '<br/>';
 			}
 		}
 		// Wife parents
-		echo $wife->getPrimaryParentsNames('parents_'.$table_id.' details1', 'none');
-		echo '</td>';
+		$html .= $wife->getPrimaryParentsNames("parents_".$table_id." details1", 'none');
+		$html .= '</td>';
 		// Dummy column to match colspan in header
-		echo '<td style="display:none;"></td>';
+		$html .= '<td style="display:none;"></td>';
 		//-- Wife GIVN
 		//-- Husb GIVN
 		// Use "AAAA" as a separator (instead of ",") as JavaScript.localeCompare() ignores
 		// punctuation and "ANN,ROACH" would sort after "ANNE,ROACH", instead of before it.
 		// Similarly, @N.N. would sort as NN.
-		echo '<td>', htmlspecialchars(str_replace('@P.N.', 'AAAA', $givn)), 'AAAA', htmlspecialchars(str_replace('@N.N.', 'AAAA', $surn)), '</td>';
-		echo '<td>', htmlspecialchars(str_replace('@N.N.', 'AAAA', $surn)), 'AAAA', htmlspecialchars(str_replace('@P.N.', 'AAAA', $givn)), '</td>';
+		$html .= '<td>'. htmlspecialchars(str_replace('@P.N.', 'AAAA', $givn)). 'AAAA'. htmlspecialchars(str_replace('@N.N.', 'AAAA', $surn)). '</td>';
+		$html .= '<td>'. htmlspecialchars(str_replace('@N.N.', 'AAAA', $surn)). 'AAAA'. htmlspecialchars(str_replace('@P.N.', 'AAAA', $givn)). '</td>';
 		$mdate=$family->getMarriageDate();
 		//-- Wife age
-		echo '<td>';
+		$html .= '<td>';
 		$wdate=$wife->getBirthDate();
 		if ($wdate->isOK() && $mdate->isOK()) {
 			if ($wdate->gregorianYear()>=1550 && $wdate->gregorianYear()<2030) {
@@ -767,20 +768,20 @@ function print_fam_table($datalist, $option='') {
 			}
 			$wage=WT_Date::GetAgeYears($wdate, $mdate);
 			$wage_jd = $mdate->MinJD()-$wdate->MinJD();
-			echo WT_I18N::number($wage);
+			$html .= WT_I18N::number($wage);
 			$marr_by_age[max(0, min($max_age, $wage))] .= $wife->getSex();
 		} else {
 			$wage=0;
 		}
-		echo '</td><td>', $wage, '</td>';
+		$html .= '</td><td>'. $wage. '</td>';
 		//-- Marriage date
-		echo '<td>';
+		$html .= '<td>';
 		if ($marriage_dates=$family->getAllMarriageDates()) {
 			foreach ($marriage_dates as $n=>$marriage_date) {
 				if ($n) {
-					echo '<br/>';
+					$html .= '<br/>';
 				}
-				echo '<div>', $marriage_date->Display(!$SEARCH_SPIDER), '</div>';
+				$html .= '<div>'. $marriage_date->Display(!$SEARCH_SPIDER). '</div>';
 			}
 			if ($marriage_dates[0]->gregorianYear()>=1550 && $marriage_dates[0]->gregorianYear()<2030) {
 				$marr_by_decade[floor($marriage_dates[0]->gregorianYear()/10)*10] .= $husb->getSex().$wife->getSex();
@@ -788,123 +789,124 @@ function print_fam_table($datalist, $option='') {
 		} else if (get_sub_record(1, '1 _NMR', $family->getGedcomRecord())) {
 			$hus = $family->getHusband();
 			$wif = $family->getWife();
-			if (empty($wif) && !empty($hus)) echo WT_Gedcom_Tag::getLabel('_NMR', $hus);
-			else if (empty($hus) && !empty($wif)) echo WT_Gedcom_Tag::getLabel('_NMR', $wif);
-			else echo WT_Gedcom_Tag::getLabel('_NMR');
+			if (empty($wif) && !empty($hus)) $html .= WT_Gedcom_Tag::getLabel('_NMR', $hus);
+			else if (empty($hus) && !empty($wif)) $html .= WT_Gedcom_Tag::getLabel('_NMR', $wif);
+			else $html .= WT_Gedcom_Tag::getLabel('_NMR');
 		} else if (get_sub_record(1, '1 _NMAR', $family->getGedcomRecord())) {
 			$hus = $family->getHusband();
 			$wif = $family->getWife();
-			if (empty($wif) && !empty($hus)) echo WT_Gedcom_Tag::getLabel('_NMAR', $hus);
-			else if (empty($hus) && !empty($wif)) echo WT_Gedcom_Tag::getLabel('_NMAR', $wif);
-			else echo WT_Gedcom_Tag::getLabel('_NMAR');
+			if (empty($wif) && !empty($hus)) $html .= WT_Gedcom_Tag::getLabel('_NMAR', $hus);
+			else if (empty($hus) && !empty($wif)) $html .= WT_Gedcom_Tag::getLabel('_NMAR', $wif);
+			else $html .= WT_Gedcom_Tag::getLabel('_NMAR');
 		} else {
 			$factdetail = explode(' ', trim($family->getMarriageRecord()));
 			if (isset($factdetail)) {
 				if (count($factdetail) >= 3) {
 					if (strtoupper($factdetail[2]) != "N") {
-						echo WT_I18N::translate('yes');
+						$html .= WT_I18N::translate('yes');
 					} else {
-						echo WT_I18N::translate('no');
+						$html .= WT_I18N::translate('no');
 					}
 				} else {
-					echo '&nbsp;';
+					$html .= '&nbsp;';
 				}
 			}
 		}
-		echo '</td>';
+		$html .= '</td>';
 		//-- Event date (sortable)hidden by datatables code
-		echo '<td>';
+		$html .= '<td>';
 		if ($marriage_dates) {
-			echo $marriage_date->JD();
+			$html .= $marriage_date->JD();
 		} else {
-			echo 0;
+			$html .= 0;
 		}
-		echo '</td>';
+		$html .= '</td>';
 		//-- Marriage anniversary
-		echo '<td>';
+		$html .= '<td>';
 		$mage=WT_Date::GetAgeYears($mdate);
 		if ($mage) {
-			echo WT_I18N::number($mage);
+			$html .= WT_I18N::number($mage);
 		} else {
-			echo '&nbsp;';
+			$html .= '&nbsp;';
 		}
-		echo '</td>';
+		$html .= '</td>';
 		//-- Marriage place
-		echo '<td>';
+		$html .= '<td>';
 		foreach ($family->getAllMarriagePlaces() as $n=>$marriage_place) {
 			if ($n) {
-				echo '<br>';
+				$html .= '<br>';
 			}
 			if ($SEARCH_SPIDER) {
-				echo get_place_short($marriage_place), ' ';
+				$html .= get_place_short($marriage_place). ' ';
 			} else {
-				echo '<a href="', get_place_url($marriage_place), '" title="', $marriage_place, '">';
-				echo highlight_search_hits(get_place_short($marriage_place)), '</a>';
+				$html .= '<a href="'. get_place_url($marriage_place). '" title="'. $marriage_place. '">';
+				$html .= highlight_search_hits(get_place_short($marriage_place)). '</a>';
 			}
 		}
-		echo '</td>';
+		$html .= '</td>';
 		//-- Number of children
 		$nchi=$family->getNumberOfChildren();
-		echo '<td>', WT_I18N::number($nchi), '</td><td>', $nchi, '</td>';
+		$html .= '<td>'. WT_I18N::number($nchi). '</td><td>'. $nchi. '</td>';
 		//-- Last change
 		if ($SHOW_LAST_CHANGE) {
-			echo '<td>', $family->LastChangeTimestamp(empty($SEARCH_SPIDER)), '</td>';
+			$html .= '<td>'. $family->LastChangeTimestamp(empty($SEARCH_SPIDER)). '</td>';
 		} else {
-			echo '<td>&nbsp;</td>';
+			$html .= '<td>&nbsp;</td>';
 		}
 		//-- Sorting by marriage date
-		echo '<td>';
+		$html .= '<td>';
 		if (!$family->canDisplayDetails() || !$mdate->isOK()) {
-			echo 'U';
+			$html .= 'U';
 		} else {
 			if (WT_Date::Compare($mdate, $d100y)>0) {
-				echo 'Y100';
+				$html .= 'Y100';
 			} else {
-				echo 'YES';
+				$html .= 'YES';
 			}
 		}
 		if ($family->isDivorced()) {
-			echo 'D';
+			$html .= 'D';
 		}
 		if (count($husb->getSpouseFamilies())>1 || count($wife->getSpouseFamilies())>1) {
-			echo 'M';
+			$html .= 'M';
 		}
-		echo '</td>';
+		$html .= '</td>';
 		//-- Sorting alive/dead
-		echo '<td>';
-			if ($husb->isDead() && $wife->isDead()) echo 'Y';
+		$html .= '<td>';
+			if ($husb->isDead() && $wife->isDead()) $html .= 'Y';
 			if ($husb->isDead() && !$wife->isDead()) {
-				if ($wife->getSex()=='F') echo 'H';
-				if ($wife->getSex()=='M') echo 'W'; // male partners
+				if ($wife->getSex()=='F') $html .= 'H';
+				if ($wife->getSex()=='M') $html .= 'W'; // male partners
 			}
 			if (!$husb->isDead() && $wife->isDead()) {
-				if ($husb->getSex()=='M') echo 'W';
-				if ($husb->getSex()=='F') echo 'H'; // female partners
+				if ($husb->getSex()=='M') $html .= 'W';
+				if ($husb->getSex()=='F') $html .= 'H'; // female partners
 			}
-			if (!$husb->isDead() && !$wife->isDead()) echo 'N';
-		echo '</td>';
+			if (!$husb->isDead() && !$wife->isDead()) $html .= 'N';
+		$html .= '</td>';
 		//-- Roots or Leaves
-		echo '<td>';
-			if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; } // roots
-			elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren()<1) { echo 'L'; } // leaves
-			else { echo '&nbsp;'; }
-		echo '</td>',
-		'</tr>';
+		$html .= '<td>';
+			if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { $html .= 'R'; } // roots
+			elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren()<1) { $html .= 'L'; } // leaves
+			else { $html .= '&nbsp;'; }
+		$html .= '</td>
+		</tr>';
 	}
-	echo '</tbody>',
+	$html .= '</tbody>'.
 		'</table>';
 	//-- charts
-	echo '<div class="fam_list_table-charts_', $table_id, '" style="display:none">',
-		'<table class="list_table center">',
-		'<tr><td class="list_value_wrap">',
-		print_chart_by_decade($birt_by_decade, WT_I18N::translate('Decade of birth')),
-		'</td><td class="list_value_wrap">',
-		print_chart_by_decade($marr_by_decade, WT_I18N::translate('Decade of marriage')),
-		'</td></tr><tr><td colspan="2" class="list_value_wrap">',
-		print_chart_by_age($marr_by_age, WT_I18N::translate('Age in year of marriage')),
-		'</td></tr></table>',
-		'</div>',
-		'</div>'; // Close "fam-list"
+	$html .= '<div class="fam_list_table-charts_'. $table_id. '" style="display:none">
+		<table class="list-charts"><tr><td>'.
+		print_chart_by_decade($birt_by_decade, WT_I18N::translate('Decade of birth')).
+		'</td><td>'.
+		print_chart_by_decade($marr_by_decade, WT_I18N::translate('Decade of marriage')).
+		'</td></tr><tr><td colspan="2">'.
+		print_chart_by_age($marr_by_age, WT_I18N::translate('Age in year of marriage')).
+		'</td></tr></table>
+		</div>
+		</div>'; // Close "fam-list"
+	
+	return $html;
 }
 
 // print a table of sources
diff --git a/library/WT/Controller/Search.php b/library/WT/Controller/Search.php
index b991ce9fdc..ab94c31404 100644
--- a/library/WT/Controller/Search.php
+++ b/library/WT/Controller/Search.php
@@ -657,7 +657,7 @@ class WT_Controller_Search extends WT_Controller_Base {
 							load_gedcom_settings($ged_id);
 							echo '<h3 class="fam-acc-header"><a href="#"><span class="search_item">'.$this->myquery.'</span>&nbsp;@&nbsp;'.PrintReady(get_gedcom_setting($ged_id, 'title')), '</a></h3>
 								<div class="fam-acc_content">';
-								print_fam_table($datalist);
+								echo format_fam_table($datalist);
 							echo '</div>';//fam-acc_content
 						}
 					}
diff --git a/mediaviewer.php b/mediaviewer.php
index 004bb9b37e..17e5af705a 100644
--- a/mediaviewer.php
+++ b/mediaviewer.php
@@ -158,7 +158,7 @@ echo '<div id="media-tabs">';
 	// Families linked to this media object
 	if ($controller->record->countLinkedFamilies()) {
 		echo '<div id="fam-media">';
-		print_fam_table($controller->record->fetchLinkedFamilies(), $controller->record->getFullName());
+		echo format_fam_table($controller->record->fetchLinkedFamilies(), $controller->record->getFullName());
 		echo '</div>'; //close "fam-media"
 	}
 
diff --git a/note.php b/note.php
index b4b6c57ee1..3810a12afa 100644
--- a/note.php
+++ b/note.php
@@ -165,7 +165,7 @@ echo '<div id="note-tabs">
 	// Families linked to this shared note
 	if ($controller->record->countLinkedFamilies()) {
 		echo '<div id="fam-note">';
-		print_fam_table($controller->record->fetchLinkedFamilies(), $controller->record->getFullName());
+		echo format_fam_table($controller->record->fetchLinkedFamilies(), $controller->record->getFullName());
 		echo '</div>'; //close "fam-note"
 	}
 	// Media Items linked to this shared note
diff --git a/placelist.php b/placelist.php
index 0645748d8a..60aa3634f1 100644
--- a/placelist.php
+++ b/placelist.php
@@ -336,7 +336,7 @@ if ($level > 0) {
 				if (!empty($mysourcelist)) {echo '<li><a href="#places-source"><span id="mediasource">', WT_I18N::translate('Sources'), '</span></a></li>';}
 			echo '</ul>';
 		if (!empty($myindilist)) {echo '<div id="places-indi">', format_indi_table($myindilist), '</div>';}
-		if (!empty($myfamlist)) {echo '<div id="places-fam">', print_fam_table($myfamlist), '</div>';}
+		if (!empty($myfamlist)) {echo '<div id="places-fam">', echo format_fam_table($myfamlist), '</div>';}
 		if (!empty($mysourcelist)) {echo '<div id="places-source">', print_sour_table($mysourcelist), '</div>';}
 		echo '</div>';//close #places-tabs
 		}
diff --git a/source.php b/source.php
index f48ad44cfc..9557420698 100644
--- a/source.php
+++ b/source.php
@@ -148,7 +148,7 @@ echo '<div id="source-tabs">
 	// Families linked to this source
 	if ($controller->record->countLinkedFamilies()) {
 		echo '<div id="fam-sources">';
-		print_fam_table($controller->record->fetchLinkedFamilies(), $controller->record->getFullName());
+		echo format_fam_table($controller->record->fetchLinkedFamilies(), $controller->record->getFullName());
 		echo '</div>'; //close "fam-sources"
 	}
 	// Media Items linked to this source