diff options
| author | Brian Holland <windmillway2@gmail.com> | 2010-10-12 03:51:16 +0000 |
|---|---|---|
| committer | Brian Holland <windmillway2@gmail.com> | 2010-10-12 03:51:16 +0000 |
| commit | 68f4a72d11efad894330b6929dc01b050d93001f (patch) | |
| tree | 943cfab8f681b6edb6ae2eaa980cc2d8432bfb47 /modules/GEDFact_assistant | |
| parent | c3183b364c09b6b8855b6ccb98975f163e759743 (diff) | |
| download | webtrees-68f4a72d11efad894330b6929dc01b050d93001f.tar.gz webtrees-68f4a72d11efad894330b6929dc01b050d93001f.tar.bz2 webtrees-68f4a72d11efad894330b6929dc01b050d93001f.zip | |
Further corrections to svn 9654
Diffstat (limited to 'modules/GEDFact_assistant')
| -rw-r--r-- | modules/GEDFact_assistant/_CENS/census_1_ctrl.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/GEDFact_assistant/_CENS/census_1_ctrl.php b/modules/GEDFact_assistant/_CENS/census_1_ctrl.php index fa586def8f..8accc67fba 100644 --- a/modules/GEDFact_assistant/_CENS/census_1_ctrl.php +++ b/modules/GEDFact_assistant/_CENS/census_1_ctrl.php @@ -52,11 +52,10 @@ $person=Person::getInstance($pid); $nam = $person->getAllNames(); if (PrintReady($person->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($person->getDeathYear()); } if (PrintReady($person->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($person->getBirthYear()); } -if ($married>=0 && isset($nam[1])){ - $wholename = rtrim($nam[1]['full']); -} else { - $wholename = rtrim($nam[0]['full']); -} +$fulln = rtrim($nam[0]['givn'],'*')." ".$nam[0]['surname']; +$fulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $fulln); +$fulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $fulln); +$wholename = $fulln; $currpid=$pid; ?> |