diff options
Diffstat (limited to 'library')
| -rw-r--r-- | library/WT/Controller/AdvancedSearch.php | 2 | ||||
| -rw-r--r-- | library/WT/Controller/Search.php | 8 | ||||
| -rw-r--r-- | library/WT/MenuBar.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/library/WT/Controller/AdvancedSearch.php b/library/WT/Controller/AdvancedSearch.php index 7e45ce7b67..22e9f1a0cd 100644 --- a/library/WT/Controller/AdvancedSearch.php +++ b/library/WT/Controller/AdvancedSearch.php @@ -443,7 +443,7 @@ class WT_Controller_AdvancedSearch extends WT_Controller_Search { if (count($this->myindilist)>0) { echo '<br /><div class="center">'; uasort($this->myindilist, array('WT_GedcomRecord', 'Compare')); - print_indi_table($this->myindilist, WT_I18N::translate('Individuals')." @ ".PrintReady(get_gedcom_setting(WT_GEDCOM, 'title'), true)); + print_indi_table($this->myindilist, WT_I18N::translate('Individuals')." @ ".PrintReady(get_gedcom_setting(WT_GEDCOM, 'title'))); echo "</div>"; } else { diff --git a/library/WT/Controller/Search.php b/library/WT/Controller/Search.php index 7cecc7da63..d90d47adb0 100644 --- a/library/WT/Controller/Search.php +++ b/library/WT/Controller/Search.php @@ -622,7 +622,7 @@ class WT_Controller_Search extends WT_Controller_Base { usort($datalist, array('WT_GedcomRecord', 'Compare')); $GEDCOM=$gedcom; load_gedcom_settings($ged_id); - print_indi_table($datalist, WT_I18N::translate('Individuals').' : «'.$this->myquery.'» @ '.PrintReady(get_gedcom_setting($ged_id, 'title'), true)); + print_indi_table($datalist, WT_I18N::translate('Individuals').' : «'.$this->myquery.'» @ '.PrintReady(get_gedcom_setting($ged_id, 'title'))); } } // Split families by gedcom @@ -638,7 +638,7 @@ class WT_Controller_Search extends WT_Controller_Base { usort($datalist, array('WT_GedcomRecord', 'Compare')); $GEDCOM=$gedcom; load_gedcom_settings($ged_id); - print_fam_table($datalist, WT_I18N::translate('Families').' : «'.$this->myquery.'» @ '.PrintReady(get_gedcom_setting($ged_id, 'title'), true)); + print_fam_table($datalist, WT_I18N::translate('Families').' : «'.$this->myquery.'» @ '.PrintReady(get_gedcom_setting($ged_id, 'title'))); } } // Split sources by gedcom @@ -654,7 +654,7 @@ class WT_Controller_Search extends WT_Controller_Base { usort($datalist, array('WT_GedcomRecord', 'Compare')); $GEDCOM=$gedcom; load_gedcom_settings($ged_id); - print_sour_table($datalist, WT_I18N::translate('Sources').' : «'.$this->myquery.'» @ '.PrintReady(get_gedcom_setting($ged_id, 'title'), true)); + print_sour_table($datalist, WT_I18N::translate('Sources').' : «'.$this->myquery.'» @ '.PrintReady(get_gedcom_setting($ged_id, 'title'))); } } // Split notes by gedcom @@ -670,7 +670,7 @@ class WT_Controller_Search extends WT_Controller_Base { usort($datalist, array('WT_GedcomRecord', 'Compare')); $GEDCOM=$gedcom; load_gedcom_settings($ged_id); - print_note_table($datalist, WT_I18N::translate('Notes').' : «'.$this->myquery.'» @ '.PrintReady(get_gedcom_setting($ged_id, 'title'), true)); + print_note_table($datalist, WT_I18N::translate('Notes').' : «'.$this->myquery.'» @ '.PrintReady(get_gedcom_setting($ged_id, 'title'))); } } $GEDCOM=WT_GEDCOM; diff --git a/library/WT/MenuBar.php b/library/WT/MenuBar.php index 80fd0ea56a..e2072a0a80 100644 --- a/library/WT/MenuBar.php +++ b/library/WT/MenuBar.php @@ -35,7 +35,7 @@ class WT_MenuBar { global $WT_IMAGES; //-- main menu - $menu = new WT_Menu(WT_I18N::translate('Home page'), 'index.php?ctype=gedcom', 'menu-tree', 'down'); + $menu = new WT_Menu(WT_I18N::translate('Home page'), 'index.php?ctype=gedcom&ged='.WT_GEDURL, 'menu-tree', 'down'); if (!empty($WT_IMAGES['home'])) { $menu->addIcon('home'); } @@ -46,7 +46,7 @@ class WT_MenuBar { foreach ($gedcom_titles as $gedcom_title) { if ($gedcom_title->gedcom_id==WT_GED_ID || $ALLOW_CHANGE_GEDCOM) { $submenu = new WT_Menu( - PrintReady($gedcom_title->gedcom_title, true), + PrintReady($gedcom_title->gedcom_title), 'index.php?ctype=gedcom&ged='.rawurlencode($gedcom_title->gedcom_name), 'menu-tree-'.$gedcom_title->gedcom_id // Cannot use name - it must be a CSS identifier ); |