diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2020-12-23 17:59:39 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2020-12-23 18:05:41 +0000 |
| commit | 9d7226754b0d6ce9c88fe08f8c283bb8ebc8a5b0 (patch) | |
| tree | 407ccae73de61220b02699b4c9f67ca40363f499 /app/Census/AbstractCensusColumn.php | |
| parent | 8fb4e87c164dd1c819d686ab0ce9556a2afb03f7 (diff) | |
| download | webtrees-9d7226754b0d6ce9c88fe08f8c283bb8ebc8a5b0.tar.gz webtrees-9d7226754b0d6ce9c88fe08f8c283bb8ebc8a5b0.tar.bz2 webtrees-9d7226754b0d6ce9c88fe08f8c283bb8ebc8a5b0.zip | |
Fix: single-parent family breaks census assistant
Diffstat (limited to 'app/Census/AbstractCensusColumn.php')
| -rw-r--r-- | app/Census/AbstractCensusColumn.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/app/Census/AbstractCensusColumn.php b/app/Census/AbstractCensusColumn.php index e447b9fb22..168f19c6e3 100644 --- a/app/Census/AbstractCensusColumn.php +++ b/app/Census/AbstractCensusColumn.php @@ -134,13 +134,16 @@ class AbstractCensusColumn $family = $this->spouseFamily($individual); if ($family instanceof Family) { - foreach ($family->facts(['MARR']) as $marriage) { - if ($marriage->date()->isOK()) { - $spouse = $family->spouse($individual); - foreach ($names as $individual_name) { - foreach ($spouse->getAllNames() as $spouse_name) { - if ($individual_name['type'] === '_MARNM' && $individual_name['surn'] === $spouse_name['surn']) { - return $individual_name; + $spouse = $family->spouse($individual); + + if ($spouse instanceof Individual) { + foreach ($family->facts(['MARR']) as $marriage) { + if ($marriage->date()->isOK()) { + foreach ($names as $individual_name) { + foreach ($spouse->getAllNames() as $spouse_name) { + if ($individual_name['type'] === '_MARNM' && $individual_name['surn'] === $spouse_name['surn']) { + return $individual_name; + } } } } |
