From 10f748d5d6c268cdc67b276ff414bb013cfd985a Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 25 Oct 2016 07:44:40 +0000
Subject: [PATCH] Bugfix for the Foundry theme engine: Multiple contact entries
 with the same key were not processed correctly.

git-svn-id: https://svn.libreccm.org/ccm/trunk@4406 8810af33-2d31-482b-a856-94f89814c4df
---
 .../template-tags/content-items/contact.xsl   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/contact.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/contact.xsl
index c22b2021c..6fa175e4a 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/contact.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/contact.xsl
@@ -98,15 +98,19 @@
 
         <xsl:variable name="keyId" select="./@key"/>
 
+        <xsl:variable name="entry-layout-tree" select="." />
+
         <xsl:if test="$contact-entries[./keyId = $keyId]">
-            <xsl:apply-templates>
-                <xsl:with-param name="label" 
-                                tunnel="yes"  
-                                select="$contact-entries[./keyId = $keyId]/key"/>
-                <xsl:with-param name="value" 
-                                tunnel="yes"  
-                                select="$contact-entries[./keyId = $keyId]/value"/>
-            </xsl:apply-templates>
+            <xsl:for-each select="$contact-entries[./keyId = $keyId]">
+                <xsl:apply-templates select="$entry-layout-tree/*">
+                    <xsl:with-param name="label"
+                                    tunnel="yes"
+                                    select="./key" />
+                    <xsl:with-param name="value"
+                                    tunnel="yes"
+                                    select="./value" />
+                    </xsl:apply-templates>
+            </xsl:for-each>
         </xsl:if>
     </xsl:template>
     
@@ -316,4 +320,4 @@
         <xsl:value-of select="$address/isoCountryCode"/>
     </xsl:template>
     
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>