diff options
| author | fisharebest <fisharebest@gmail.com> | 2013-07-16 21:59:08 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2013-07-16 21:59:08 +0000 |
| commit | b9bb8ea33d62189c30d40456cb4550a5d4b3e5b2 (patch) | |
| tree | b19b32487da9d4d1c627b8df357bf09ad0ae6c7b /modules_v3 | |
| parent | 41ad8fa957e59c44918e076c17ea7b6e23dfcf61 (diff) | |
| download | webtrees-b9bb8ea33d62189c30d40456cb4550a5d4b3e5b2.tar.gz webtrees-b9bb8ea33d62189c30d40456cb4550a5d4b3e5b2.tar.bz2 webtrees-b9bb8ea33d62189c30d40456cb4550a5d4b3e5b2.zip | |
Refactor - no longer need WT_GedcomRecord::equals() - can use "=="
Diffstat (limited to 'modules_v3')
| -rw-r--r-- | modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php | 4 | ||||
| -rw-r--r-- | modules_v3/personal_facts/module.php | 2 | ||||
| -rw-r--r-- | modules_v3/tree/class_treeview.php | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php index 6299c4ab10..d3c5a70b81 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php @@ -1086,7 +1086,7 @@ if (!defined('WT_WEBTREES')) { echo addslashes($fulln); // mnam = Full Name } ?>", "<?php - if ($gparent->equals($person)) { + if ($gparent == $person) { echo "Head"; // label = Head } else { echo $label; // label = Relationship @@ -1582,7 +1582,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", //-- Step Husband -------------------------------------- if ($natdad == "yes") { } else { - if (($husb || $num>0) && !$husb->equals($person)) { + if (($husb || $num>0) && $husb != $person) { if ($husb) { //-- Step Husbands Parents ----------------------------- $gparent=WT_Individual::getInstance($husb->getXref()); diff --git a/modules_v3/personal_facts/module.php b/modules_v3/personal_facts/module.php index a2726fe43b..5f8f65f037 100644 --- a/modules_v3/personal_facts/module.php +++ b/modules_v3/personal_facts/module.php @@ -337,7 +337,7 @@ class personal_facts_WT_Module extends WT_Module implements WT_Module_Tab { } foreach ($family->getSpouses() as $spouse) { foreach ($spouse->getSpouseFamilies() as $sfamily) { - if (!$family->equals($sfamily)) { + if ($family != $sfamily) { // Add half-siblings foreach (self::child_facts($person, $sfamily, '_HSIB', '') as $fact) { $facts[] = $fact; diff --git a/modules_v3/tree/class_treeview.php b/modules_v3/tree/class_treeview.php index 152020a036..8afa4131bc 100644 --- a/modules_v3/tree/class_treeview.php +++ b/modules_v3/tree/class_treeview.php @@ -244,8 +244,8 @@ class TreeView { $dashed = ''; foreach ($sfams as $famid=>$family) { $p = $family->getSpouse($person); - if (!empty($p)) { - if (($p->equals($partner)) || $this->allPartners) { + if ($p) { + if (($p == $partner) || $this->allPartners) { $pf = $p->getPrimaryChildFamily(); if (!empty($pf)) { $fop[] = Array($pf->getHusband(), $pf); |
