diff options
Diffstat (limited to 'library/WT/Controller/Search.php')
| -rw-r--r-- | library/WT/Controller/Search.php | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/library/WT/Controller/Search.php b/library/WT/Controller/Search.php index b96c93be8c..60786338a9 100644 --- a/library/WT/Controller/Search.php +++ b/library/WT/Controller/Search.php @@ -133,9 +133,9 @@ class WT_Controller_Search extends WT_Controller_Page { // Retrieve the gedcoms to search in if (count(WT_Tree::getAll()) > 1 && WT_Site::getPreference('ALLOW_CHANGE_GEDCOM')) { foreach (WT_Tree::getAll() as $search_tree) { - $str = str_replace(array(".", "-", " "), array("_", "_", "_"), $search_tree->tree_name); + $str = str_replace(array(".", "-", " "), array("_", "_", "_"), $search_tree->name); if (isset ($_REQUEST["$str"]) || $topsearch) { - $this->search_trees[$search_tree->tree_id] = $search_tree; + $this->search_trees[$search_tree->id()] = $search_tree; $_REQUEST["$str"] = 'yes'; } } @@ -607,15 +607,15 @@ class WT_Controller_Search extends WT_Controller_Page { foreach ($this->search_trees as $search_tree) { $datalist = array(); foreach ($this->myindilist as $individual) { - if ($individual->getGedcomId() === $search_tree->tree_id) { + if ($individual->getGedcomId() === $search_tree->id()) { $datalist[] = $individual; } } if ($datalist) { usort($datalist, array('WT_GedcomRecord', 'compare')); - $GEDCOM = $search_tree->tree_name; - load_gedcom_settings($search_tree->tree_id); - echo '<h3 class="indi-acc-header"><a href="#"><span class="search_item" dir="auto">', $this->myquery, '</span> @ <span>', $search_tree->tree_title_html, '</span></a></h3> + $GEDCOM = $search_tree->name; + load_gedcom_settings($search_tree->id()); + echo '<h3 class="indi-acc-header"><a href="#"><span class="search_item" dir="auto">', $this->myquery, '</span> @ <span>', $search_tree->titleHtml(), '</span></a></h3> <div class="indi-acc_content">', format_indi_table($datalist); echo '</div>'; //indi-acc_content @@ -630,15 +630,15 @@ class WT_Controller_Search extends WT_Controller_Page { foreach ($this->search_trees as $search_tree) { $datalist = array(); foreach ($this->myfamlist as $family) { - if ($family->getGedcomId() === $search_tree->tree_id) { + if ($family->getGedcomId() === $search_tree->id()) { $datalist[] = $family; } } if ($datalist) { usort($datalist, array('WT_GedcomRecord', 'compare')); - $GEDCOM = $search_tree->tree_name; - load_gedcom_settings($search_tree->tree_id); - echo '<h3 class="fam-acc-header"><a href="#"><span class="search_item" dir="auto">', $this->myquery, '</span> @ <span>', $search_tree->tree_title_html, '</span></a></h3> + $GEDCOM = $search_tree->name; + load_gedcom_settings($search_tree->id()); + echo '<h3 class="fam-acc-header"><a href="#"><span class="search_item" dir="auto">', $this->myquery, '</span> @ <span>', $search_tree->titleHtml(), '</span></a></h3> <div class="fam-acc_content">', format_fam_table($datalist); echo '</div>'; //fam-acc_content @@ -653,15 +653,15 @@ class WT_Controller_Search extends WT_Controller_Page { foreach ($this->search_trees as $search_tree) { $datalist = array(); foreach ($this->mysourcelist as $source) { - if ($source->getGedcomId() === $search_tree->tree_id) { + if ($source->getGedcomId() === $search_tree->id()) { $datalist[] = $source; } } if ($datalist) { usort($datalist, array('WT_GedcomRecord', 'compare')); - $GEDCOM = $search_tree->tree_name; - load_gedcom_settings($search_tree->tree_id); - echo '<h3 class="source-acc-header"><a href="#"><span class="search_item" dir="auto">', $this->myquery, '</span> @ <span>', $search_tree->tree_title_html, '</span></a></h3> + $GEDCOM = $search_tree->name; + load_gedcom_settings($search_tree->id()); + echo '<h3 class="source-acc-header"><a href="#"><span class="search_item" dir="auto">', $this->myquery, '</span> @ <span>', $search_tree->titleHtml(), '</span></a></h3> <div class="source-acc_content">', format_sour_table($datalist); echo '</div>'; //fam-acc_content @@ -676,15 +676,15 @@ class WT_Controller_Search extends WT_Controller_Page { foreach ($this->search_trees as $search_tree) { $datalist = array(); foreach ($this->mynotelist as $note) { - if ($note->getGedcomId() === $search_tree->tree_id) { + if ($note->getGedcomId() === $search_tree->id()) { $datalist[] = $note; } } if ($datalist) { usort($datalist, array('WT_GedcomRecord', 'compare')); - $GEDCOM = $search_tree->tree_name; - load_gedcom_settings($search_tree->tree_id); - echo '<h3 class="note-acc-header"><a href="#"><span class="search_item" dir="auto">', $this->myquery, '</span> @ <span>', $search_tree->tree_title_html, '</span></a></h3> + $GEDCOM = $search_tree->name; + load_gedcom_settings($search_tree->id()); + echo '<h3 class="note-acc-header"><a href="#"><span class="search_item" dir="auto">', $this->myquery, '</span> @ <span>', $search_tree->titleHtml(), '</span></a></h3> <div class="note-acc_content">', format_note_table($datalist); echo '</div>'; //note-acc_content |