diff options
| -rw-r--r-- | admin.php | 5 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | index_edit.php | 2 | ||||
| -rw-r--r-- | modules_v3/gedcom_block/module.php | 2 | ||||
| -rw-r--r-- | modules_v3/gedcom_stats/module.php | 2 |
5 files changed, 6 insertions, 7 deletions
@@ -145,6 +145,7 @@ echo } else { $gedadmin[$tree->tree_id]["number"] = 1; $gedadmin[$tree->tree_id]["ged"] = $tree->tree_name; + $gedadmin[$tree->tree_id]["title"] = $tree->tree_title_html; } } } @@ -164,7 +165,7 @@ echo '<tr><td> <a href="admin_users.php?action=listusers&filter=adminusers">', WT_I18N::translate('Administrators'), '</a></td><td>', $adminusers, '</td></tr>', '<tr><td colspan="2">', WT_I18N::translate('Managers'), '</td></tr>'; foreach ($gedadmin as $ged_id=>$geds) { - echo '<tr><td><div><a href="admin_users.php?action=listusers&filter=gedadmin&ged='.rawurlencode($geds['ged']), '" dir="auto">', htmlspecialchars(get_gedcom_setting($ged_id, 'title')), '</a></div></td><td>', $geds['number'], '</td></tr>'; + echo '<tr><td><div><a href="admin_users.php?action=listusers&filter=gedadmin&ged='.rawurlencode($geds['ged']), '" dir="auto">', $geds['title'], '</a></div></td><td>', $geds['number'], '</td></tr>'; } echo '<tr><td>'; if ($warnusers == 0) { @@ -203,7 +204,7 @@ echo $n=0; foreach (WT_Tree::getAll() as $tree) { $stats = new WT_Stats($tree->tree_name); - if ($ged_id==WT_GED_ID) { + if ($tree->tree_id==WT_GED_ID) { $accordion_element=$n; } ++$n; @@ -79,7 +79,7 @@ if ($ctype=='user') { $controller->requireMemberLogin(); } $controller - ->setPageTitle($ctype=='user' ? WT_I18N::translate('My page') : get_gedcom_setting(WT_GED_ID, 'title')) + ->setPageTitle($ctype=='user' ? WT_I18N::translate('My page') : WT_TREE_TITLE) ->setMetaRobots('index,follow') ->pageHeader() // By default jQuery modifies AJAX URLs to disable caching, causing JS libraries to be loaded many times. diff --git a/index_edit.php b/index_edit.php index 1ee372ff72..84c46ebd9c 100644 --- a/index_edit.php +++ b/index_edit.php @@ -83,10 +83,8 @@ foreach (WT_Module::getActiveBlocks() as $name=>$block) { } if ($user_id) { - $controller->setPageTitle(WT_I18N::translate('My page')); $blocks=get_user_blocks($user_id); } elseif ($gedcom_id) { - $controller->setPageTitle(WT_I18N::translate(get_gedcom_setting(WT_GED_ID, 'title'))); $blocks=get_gedcom_blocks($gedcom_id); } diff --git a/modules_v3/gedcom_block/module.php b/modules_v3/gedcom_block/module.php index 885198ece7..a37f086b37 100644 --- a/modules_v3/gedcom_block/module.php +++ b/modules_v3/gedcom_block/module.php @@ -46,7 +46,7 @@ class gedcom_block_WT_Module extends WT_Module implements WT_Module_Block { $indi_xref=$controller->getSignificantIndividual()->getXref(); $id=$this->getName().$block_id; $class=$this->getName().'_block'; - $title='<span dir="auto">'.get_gedcom_setting(WT_GED_ID, 'title').'</span>'; + $title='<span dir="auto">'.WT_TREE_TITLE.'</span>'; $content = '<table><tr>'; $content .= '<td><a href="pedigree.php?rootid='.$indi_xref.'&ged='.WT_GEDURL.'"><i class="icon-pedigree"></i><br>'.WT_I18N::translate('Default chart').'</a></td>'; $content .= '<td><a href="individual.php?pid='.$indi_xref.'&ged='.WT_GEDURL.'"><i class="icon-indis"></i><br>'.WT_I18N::translate('Default individual').'</a></td>'; diff --git a/modules_v3/gedcom_stats/module.php b/modules_v3/gedcom_stats/module.php index 7423f8bceb..119225c94c 100644 --- a/modules_v3/gedcom_stats/module.php +++ b/modules_v3/gedcom_stats/module.php @@ -82,7 +82,7 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block { $stats=new WT_Stats(WT_GEDCOM); - $content = '<b><a href="index.php?ctype=gedcom" dir="auto">'.htmlspecialchars(get_gedcom_setting(WT_GED_ID, 'title')).'</a></b><br>'; + $content = '<b>'.WT_TREE_TITLE.'</b><br>'; if ($show_last_update) { $content .= '<div>'./* I18N: %s is a date */ WT_I18N::translate('This family tree was last updated on %s.', strip_tags($stats->gedcomUpdated())).'</div>'; |