Show all surname variants in indi/fam list titles

fisharebest · Apr 8, 2016 · 8bac6de · 8bac6de
1 parent fdd299b
commit 8bac6de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/famlist.php b/famlist.php
@@ -83,6 +83,11 @@
 		$legend = I18N::translateContext('Unknown surname', '…');
 	} else {
 		$legend = Filter::escapeHtml($surname);
+		// The surname parameter is a root/canonical form.
+		// Display it as the actual surname
+		foreach (QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', true) as $details) {
+			$legend = implode('/', array_keys($details));
+		}
 	}
 	$url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&amp;ged=' . $WT_TREE->getNameUrl();
 	switch ($falpha) {

diff --git a/indilist.php b/indilist.php
@@ -20,8 +20,7 @@
  *
  * @global Tree   $WT_TREE
  */
-global
-$WT_TREE;
+global $WT_TREE;
 
 use Fisharebest\Webtrees\Controller\PageController;
 use Fisharebest\Webtrees\Functions\FunctionsPrintLists;
@@ -84,6 +83,11 @@
 		$legend = I18N::translateContext('Unknown surname', '…');
 	} else {
 		$legend = Filter::escapeHtml($surname);
+		// The surname parameter is a root/canonical form.
+		// Display it as the actual surname
+		foreach (QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', false) as $details) {
+			$legend = implode('/', array_keys($details));
+		}
 	}
 	$url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&amp;ged=' . $WT_TREE->getNameUrl();
 	switch ($falpha) {