From 1851872eb041d500ce72fc2de565bfe1d6147003 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 4 Feb 2011 18:38:29 +0000
Subject: [PATCH] NIHVIVO-1557 improvement to regex in firstLastList macro

---
 webapp/web/templates/freemarker/lib/lib-list.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/web/templates/freemarker/lib/lib-list.ftl b/webapp/web/templates/freemarker/lib/lib-list.ftl
index 55c89aa27..205a4982d 100644
--- a/webapp/web/templates/freemarker/lib/lib-list.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-list.ftl
@@ -126,9 +126,9 @@
         <#local classVal = "">
         
         <#-- Keep any class value already assigned -->
-        <#local currentClass = newItem?matches("^<li [^>]*(class=[\'\"](.*?)[\'\"])")>
+        <#local currentClass = newItem?matches("^<li [^>]*(class=([\'\"])(.*?)\\2)")>
         <#list currentClass as m>
-            <#local classVal = m?groups[2]> <#-- get the assigned class value -->
+            <#local classVal = m?groups[3]> <#-- get the assigned class value -->
             <#local newItem = newItem?replace(m?groups[1], "")> <#-- remove 'class="xyz"' -->
         </#list>