From f919fa6a282bb609a796d81d615a38fc0028dc32 Mon Sep 17 00:00:00 2001
From: Rod Roark <rod@sunsetsystems.com>
Date: Sun, 28 Nov 2010 10:17:22 -0800
Subject: [PATCH] Fixed bug in previous commit where saving existing encounter
 gives 404 error

---
 interface/forms/newpatient/save.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/interface/forms/newpatient/save.php b/interface/forms/newpatient/save.php
index 49edfcea0..fe917e05c 100644
--- a/interface/forms/newpatient/save.php
+++ b/interface/forms/newpatient/save.php
@@ -154,13 +154,15 @@ $result4 = sqlStatement("SELECT fe.encounter,fe.date,openemr_postcalendar_catego
 	 top.window.parent.left_nav.setPatientEncounter(EncounterIdArray,EncounterDateArray,CalendarCategoryArray);
 <?php } ?>
  top.restoreSession();
-<?php if ($GLOBALS['concurrent_layout'] && $mode == 'new') { ?>
+<?php if ($GLOBALS['concurrent_layout']) { ?>
+<?php if ($mode == 'new') { ?>
  parent.left_nav.setEncounter(<?php echo "'" . oeFormatShortDate($date) . "', $encounter, window.name"; ?>);
  parent.left_nav.setRadio(window.name, 'enc');
+<?php } // end if new encounter ?>
  parent.left_nav.loadFrame('enc2', window.name, '<?php echo $nexturl; ?>');
-<?php } else { ?>
+<?php } else { // end if concurrent layout ?>
  window.location="<?php echo $nexturl; ?>";
-<?php } ?>
+<?php } // end not concurrent layout ?>
 </script>
 
 </body>
-- 
2.11.4.GIT