From 80ed214e121d925741aa0f064b36c96726c57fe9 Mon Sep 17 00:00:00 2001
From: Taylor Cordes <taylor.cordes@rtspecialty.com>
Date: Mon, 25 Jun 2018 14:16:32 -0400
Subject: [PATCH 1/3] fixed bug preventing second parameter in conditionals

---
 src/current/c1map/render.xsl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/current/c1map/render.xsl b/src/current/c1map/render.xsl
index ae127674..c81e1431 100644
--- a/src/current/c1map/render.xsl
+++ b/src/current/c1map/render.xsl
@@ -354,14 +354,15 @@
   ]
 ">
   <!-- select the nearest condition -->
-  <xsl:variable name="cond" select="ancestor::lvmp:condition[1]" />
+  <xsl:variable name="cond" as="element( lvmp:condition )"
+                select="ancestor::lvmp:condition[1]" />
 
   <xsl:text>( ( </xsl:text>
     <xsl:text>$contract->isTruthy( </xsl:text>
       <xsl:apply-templates select="$cond/lvmp:when/lvmp:*" mode="lvmp:render" />
-      <xsl:if test="$cond/lvmp:cmp/*">
+      <xsl:if test="$cond/lvmp:cmp/text() != ''">
         <xsl:text>,</xsl:text>
-        <xsl:apply-templates select="$cond/lvmp:cmp/lvmp:*" mode="lvmp:render" />
+        <xsl:apply-templates select="$cond/lvmp:cmp/text()" mode="lvmp:render" />
       </xsl:if>
     <xsl:text>)</xsl:text>
   <xsl:text> ) ? </xsl:text>

From 1628cc0aa626e53c5fb488766dccc5d2c503baf6 Mon Sep 17 00:00:00 2001
From: Taylor Cordes <taylor.cordes@rtspecialty.com>
Date: Mon, 25 Jun 2018 16:21:12 -0400
Subject: [PATCH 2/3] Revert "fixed bug preventing second parameter in
 conditionals"

This reverts commit 80ed214e121d925741aa0f064b36c96726c57fe9.
---
 src/current/c1map/render.xsl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/current/c1map/render.xsl b/src/current/c1map/render.xsl
index c81e1431..ae127674 100644
--- a/src/current/c1map/render.xsl
+++ b/src/current/c1map/render.xsl
@@ -354,15 +354,14 @@
   ]
 ">
   <!-- select the nearest condition -->
-  <xsl:variable name="cond" as="element( lvmp:condition )"
-                select="ancestor::lvmp:condition[1]" />
+  <xsl:variable name="cond" select="ancestor::lvmp:condition[1]" />
 
   <xsl:text>( ( </xsl:text>
     <xsl:text>$contract->isTruthy( </xsl:text>
       <xsl:apply-templates select="$cond/lvmp:when/lvmp:*" mode="lvmp:render" />
-      <xsl:if test="$cond/lvmp:cmp/text() != ''">
+      <xsl:if test="$cond/lvmp:cmp/*">
         <xsl:text>,</xsl:text>
-        <xsl:apply-templates select="$cond/lvmp:cmp/text()" mode="lvmp:render" />
+        <xsl:apply-templates select="$cond/lvmp:cmp/lvmp:*" mode="lvmp:render" />
       </xsl:if>
     <xsl:text>)</xsl:text>
   <xsl:text> ) ? </xsl:text>

From badb1a59f86e72da12a27e6647d80c75e5e4dafd Mon Sep 17 00:00:00 2001
From: Taylor Cordes <taylor.cordes@rtspecialty.com>
Date: Tue, 26 Jun 2018 09:06:50 -0400
Subject: [PATCH 3/3] [DEV-3245] fixed bug preventing second paramater in
 conditionals

---
 src/current/c1map/render.xsl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/current/c1map/render.xsl b/src/current/c1map/render.xsl
index ae127674..c81e1431 100644
--- a/src/current/c1map/render.xsl
+++ b/src/current/c1map/render.xsl
@@ -354,14 +354,15 @@
   ]
 ">
   <!-- select the nearest condition -->
-  <xsl:variable name="cond" select="ancestor::lvmp:condition[1]" />
+  <xsl:variable name="cond" as="element( lvmp:condition )"
+                select="ancestor::lvmp:condition[1]" />
 
   <xsl:text>( ( </xsl:text>
     <xsl:text>$contract->isTruthy( </xsl:text>
       <xsl:apply-templates select="$cond/lvmp:when/lvmp:*" mode="lvmp:render" />
-      <xsl:if test="$cond/lvmp:cmp/*">
+      <xsl:if test="$cond/lvmp:cmp/text() != ''">
         <xsl:text>,</xsl:text>
-        <xsl:apply-templates select="$cond/lvmp:cmp/lvmp:*" mode="lvmp:render" />
+        <xsl:apply-templates select="$cond/lvmp:cmp/text()" mode="lvmp:render" />
       </xsl:if>
     <xsl:text>)</xsl:text>
   <xsl:text> ) ? </xsl:text>