From a4a478cc75207766b4b7238c7dcbd4de8c8f4b4d Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller>
Date: Mon, 5 Apr 2010 17:46:41 +0000
Subject: [PATCH] bug fix of encounter id sent to report.php function

---
 interface/forms/CAMOS/report.php           | 4 ++--
 interface/patient_file/encounter/forms.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/forms/CAMOS/report.php b/interface/forms/CAMOS/report.php
index cfb59f140..798ecbbc7 100755
--- a/interface/forms/CAMOS/report.php
+++ b/interface/forms/CAMOS/report.php
@@ -22,12 +22,12 @@ function CAMOS_report( $pid, $encounter, $cols, $id) {
       "/interface/forms/CAMOS/rx_print.php?letterhead=true&signer=doctor' target=_new>" . xl('Letterhead that doctor signs') . "</a>\n";
     echo "<br>";
     echo "<a href='" . $GLOBALS['webroot'] .
-      "/interface/forms/CAMOS/notegen.php?pid=".$GLOBALS['pid']."&encounter=".$GLOBALS['encounter']."' target=_new>" . xl('Print This Encounter') . "</a>\n";
+      "/interface/forms/CAMOS/notegen.php?pid=".$pid."&encounter=".$encounter."' target=_new>" . xl('Print This Encounter') . "</a>\n";
     echo " | ";
     echo "<a href='" . $GLOBALS['webroot'] .
       "/interface/forms/CAMOS/notegen.php' target=_new>" . xl('Print Any Encounter') . "</a></div>\n";
 //    echo "<pre>".wordwrap(stripslashes(content_parser($data['content'])))."</pre><hr>\n";
-    echo "<pre>".wordwrap(stripslashes(replace($GLOBALS['pid'],$GLOBALS['encounter'],$data['content'])))."</pre><hr>\n";
+    echo "<pre>".wordwrap(stripslashes(replace($pid,$encounter,$data['content'])))."</pre><hr>\n";
   }
 }
 ?> 
diff --git a/interface/patient_file/encounter/forms.php b/interface/patient_file/encounter/forms.php
index 35dd64eae..775153e1d 100644
--- a/interface/patient_file/encounter/forms.php
+++ b/interface/patient_file/encounter/forms.php
@@ -136,11 +136,11 @@ if ($result = getFormByEncounter($pid, $encounter, "id, date, form_id, form_name
         //
         if (substr($formdir,0,3) == 'LBF') {
           include_once($GLOBALS['incdir'] . "/forms/LBF/report.php");
-          call_user_func("lbf_report", $pid, $iter['encounter'], 2, $iter['form_id'], $formdir);
+          call_user_func("lbf_report", $pid, $encounter, 2, $iter['form_id'], $formdir);
         }
         else  {
           include_once($GLOBALS['incdir'] . "/forms/$formdir/report.php");
-          call_user_func($formdir . "_report", $pid, $iter['encounter'], 2, $iter['form_id']);
+          call_user_func($formdir . "_report", $pid, $encounter, 2, $iter['form_id']);
         }
 
         echo "</td></tr>";
-- 
2.11.4.GIT