Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTaylor Cordes <taylor.cordes@rtspecialty.com>2018-06-25 16:21:12 -0400
committerTaylor Cordes <taylor.cordes@rtspecialty.com>2018-06-25 16:21:12 -0400
commit1628cc0aa626e53c5fb488766dccc5d2c503baf6 (patch)
treee5a1b0c354f1c8d4fb872a018b50fce960eeacfa /src
parent80ed214e121d925741aa0f064b36c96726c57fe9 (diff)
downloadtame-1628cc0aa626e53c5fb488766dccc5d2c503baf6.tar.gz
tame-1628cc0aa626e53c5fb488766dccc5d2c503baf6.tar.bz2
tame-1628cc0aa626e53c5fb488766dccc5d2c503baf6.zip
Revert "fixed bug preventing second parameter in conditionals"
This reverts commit 80ed214e121d925741aa0f064b36c96726c57fe9.
Diffstat (limited to 'src')
-rw-r--r--src/current/c1map/render.xsl7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/current/c1map/render.xsl b/src/current/c1map/render.xsl
index c81e143..ae12767 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>