From 8a02e9aa55b3a47298173cf82025912f5f2d178d Mon Sep 17 00:00:00 2001
From: slubwama1 <lubwamasamuel3@gmail.com>
Date: Wed, 9 Oct 2024 14:02:26 +0300
Subject: [PATCH 1/2] correct issue of 3.3.1

---
 omod/src/main/webapp/portlets/login.jsp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/omod/src/main/webapp/portlets/login.jsp b/omod/src/main/webapp/portlets/login.jsp
index 117a2453..901c03f8 100644
--- a/omod/src/main/webapp/portlets/login.jsp
+++ b/omod/src/main/webapp/portlets/login.jsp
@@ -41,8 +41,7 @@
 				<input type="hidden" name="redirect" value="" />
 			</c:otherwise>
 		</c:choose>
-		
-		<input type="hidden" name="refererURL" value='<request:header name="referer" />' />
+		<input type="hidden" name="refererURL" value='<c:out value="${pageContext.request.getHeader('referer')}"/>' />
 	</c:if>
 	
 </form>

From 91110e19ccc2746064241421b7c1b22a5f0ab303 Mon Sep 17 00:00:00 2001
From: slubwama1 <lubwamasamuel3@gmail.com>
Date: Wed, 9 Oct 2024 15:45:42 +0300
Subject: [PATCH 2/2] resolve 3.3.1 in  mergePatientsForm.jsp

---
 omod/src/main/webapp/admin/patients/mergePatientsForm.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omod/src/main/webapp/admin/patients/mergePatientsForm.jsp b/omod/src/main/webapp/admin/patients/mergePatientsForm.jsp
index aba63002..99afcec8 100644
--- a/omod/src/main/webapp/admin/patients/mergePatientsForm.jsp
+++ b/omod/src/main/webapp/admin/patients/mergePatientsForm.jsp
@@ -781,7 +781,7 @@ function toggleUnvoidedOrderErrorMessage(){
 		<input type="hidden" id="pref" name="preferred" value=""/>
 		<input type="hidden" id="nonPref" name="nonPreferred" value=""/>
 		<input type="hidden" name="modalMode" value='${modalMode}' />
-		<input type="hidden" name="redirectURL" value='<request:header name="referer" />' />
+		<input type="hidden" name="redirectURL" value='<c:out value="${pageContext.request.getHeader('referer')}"/>' />
 	</c:if>
 </form>