diff options
| author | Greg Roach <fisharebest@gmail.com> | 2014-01-02 18:42:28 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2014-01-02 18:42:28 +0000 |
| commit | 63e46bb247c4ed290aab4297af677957c81ae813 (patch) | |
| tree | 7e650c35cc21fe5c3f06d829c565b747a48a15e5 | |
| parent | 1fa7201e9e4eada715381c6b1a6bc8ee2955f5bf (diff) | |
| download | webtrees-63e46bb247c4ed290aab4297af677957c81ae813.tar.gz webtrees-63e46bb247c4ed290aab4297af677957c81ae813.tar.bz2 webtrees-63e46bb247c4ed290aab4297af677957c81ae813.zip | |
Correction to the fix for issue #64
| -rw-r--r-- | reportengine.php | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/reportengine.php b/reportengine.php index 930ee3594b..21f701dde1 100644 --- a/reportengine.php +++ b/reportengine.php @@ -69,22 +69,31 @@ foreach ($vars as $name=>$var) { switch ($type[$name]) { case 'INDI': $record = WT_Individual::getInstance($var); + if ($record && $record->canShowName()) { + $newvars[$name]['gedcom'] = $record->privatizeGedcom(WT_USER_ACCESS_LEVEL); + } else { + $action = 'setup'; + } break; case 'FAM': $record = WT_Family::getInstance($var); + if ($record && $record->canShowName()) { + $newvars[$name]['gedcom'] = $record->privatizeGedcom(WT_USER_ACCESS_LEVEL); + } else { + $action = 'setup'; + } break; case 'SOUR': $record = WT_Source::getInstance($var); + if ($record && $record->canShowName()) { + $newvars[$name]['gedcom'] = $record->privatizeGedcom(WT_USER_ACCESS_LEVEL); + } else { + $action = 'setup'; + } break; default: - $record = null; break; } - if ($record && $record->canShowName()) { - $newvars[$name]['gedcom'] = $record->privatizeGedcom(WT_USER_ACCESS_LEVEL); - } else { - $action = 'setup'; - } } } $vars = $newvars; |