From 63e46bb247c4ed290aab4297af677957c81ae813 Mon Sep 17 00:00:00 2001
From: Greg Roach <fisharebest@gmail.com>
Date: Thu, 2 Jan 2014 18:42:28 +0000
Subject: Correction to the fix for issue #64

---
 reportengine.php | 21 +++++++++++++++------
 1 file 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;
-- 
cgit v1.3