Skip to content

Commit

Permalink
Merge pull request #65 from familytree365/analysis-gOyR1G
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
curtisdelicata authored Oct 26, 2021
2 parents 895937f + 0503e95 commit 86dba90
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Utils/FamilyData.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ public static function getFamily($conn, $families, $obje_ids = [], $sour_ids = [

$husband_key = $parentData ? array_search($husb, array_column($parentData, 'gid')) : null;
$husband_uid = $parentData[$husband_key]['uid'] ?? null;
if(Person::where('uid', $husband_uid)->first() != null) {
if (Person::where('uid', $husband_uid)->first() != null) {
$husband_id = Person::where('uid', $husband_uid)->first()->id;
} else {
$husband_id = null;
}

$wife_key = $parentData ? array_search($wife, array_column($parentData, 'gid')) : null;
$wife_uid = $parentData[$wife_key]['uid'] ?? null;
if(Person::where('uid', $wife_uid)->first() != null) {
if (Person::where('uid', $wife_uid)->first() != null) {
$wife_id = Person::where('uid', $wife_uid)->first()->id;
} else {
$wife_id = null;
Expand Down
2 changes: 1 addition & 1 deletion src/Utils/otherFamRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static function insertFamilyData($conn, $persons_id, $families, $obje_ids
}
}
$_group = 'fam';
if($familie == null) {
if ($familie == null) {
$_gid = 0;
} else {
$_gid = $familie->id;
Expand Down

0 comments on commit 86dba90

Please sign in to comment.