summaryrefslogtreecommitdiff
path: root/library/WT/Individual.php
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2013-07-16 21:59:08 +0000
committerfisharebest <fisharebest@gmail.com>2013-07-16 21:59:08 +0000
commitb9bb8ea33d62189c30d40456cb4550a5d4b3e5b2 (patch)
treeb19b32487da9d4d1c627b8df357bf09ad0ae6c7b /library/WT/Individual.php
parent41ad8fa957e59c44918e076c17ea7b6e23dfcf61 (diff)
downloadwebtrees-b9bb8ea33d62189c30d40456cb4550a5d4b3e5b2.tar.gz
webtrees-b9bb8ea33d62189c30d40456cb4550a5d4b3e5b2.tar.bz2
webtrees-b9bb8ea33d62189c30d40456cb4550a5d4b3e5b2.zip
Refactor - no longer need WT_GedcomRecord::equals() - can use "=="
Diffstat (limited to 'library/WT/Individual.php')
-rw-r--r--library/WT/Individual.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/library/WT/Individual.php b/library/WT/Individual.php
index c71239ed79..f4238fa33a 100644
--- a/library/WT/Individual.php
+++ b/library/WT/Individual.php
@@ -936,8 +936,8 @@ class WT_Individual extends WT_GedcomRecord {
// Create a label for a step family
function getStepFamilyLabel(WT_Family $family) {
foreach ($this->getChildFamilies() as $fam) {
- if (!$fam->equals($family)) {
- if ((is_null($fam->getHusband()) || !$fam->getHusband()->equals($family->getHusband())) && (is_null($fam->getWife()) || $fam->getWife()->equals($family->getWife()))) {
+ if ($fam != $family) {
+ if ((is_null($fam->getHusband()) || $fam->getHusband() != $family->getHusband()) && (is_null($fam->getWife()) || $fam->getWife() == $family->getWife())) {
if ($family->getHusband()) {
if ($family->getWife()->getSex()=='F') {
return /* I18N: A step-family. %s is an individual’s name */ WT_I18N::translate('Mother’s family with %s', $family->getHusband()->getFullName());
@@ -951,7 +951,7 @@ class WT_Individual extends WT_GedcomRecord {
return /* I18N: A step-family. */ WT_I18N::translate('Father’s family with an unknown individual');
}
}
- } elseif ((is_null($fam->getWife()) || !$fam->getWife()->equals($family->getWife())) && (is_null($fam->getHusband()) || $fam->getHusband()->equals($family->getHusband()))) {
+ } elseif ((is_null($fam->getWife()) || $fam->getWife() != $family->getWife()) && (is_null($fam->getHusband()) || $fam->getHusband() == $family->getHusband())) {
if ($family->getWife()) {
if ($family->getHusband()->getSex()=='F') {
return /* I18N: A step-family. %s is an individual’s name */ WT_I18N::translate('Mother’s family with %s', $family->getWife()->getFullName());