From 2ed7b938bc62d9cccccea64a6bfcbc11ee3fdc51 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 16 Jan 2015 17:34:21 +0000
Subject: [PATCH] Foundry now supports paramters in internal related links.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3080 8810af33-2d31-482b-a856-94f89814c4df
---
 .../content-items/assets/related-links.xsl       | 16 +++++++++++++++-
 .../foundry/lib/template-tags/html-tags.xsl      |  4 +++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
index 4f7629931..998c71fa3 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
@@ -47,12 +47,26 @@
          
             <xsl:choose>
                 <xsl:when test="./targetType = 'internalLink'">
+                    <xsl:variable name="params">
+                        <xsl:choose>
+                            <xsl:when test="starts-with(./targetURI, '&amp;?')">
+                                <xsl:value-of select="concat('&amp;', substring(./targetURI, 3))"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="./targetURI"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:variable>
+                    
                     <xsl:apply-templates select="$links-layout-tree/internal/*">
                         <xsl:with-param name="link-title" tunnel="yes" select="./linkTitle"/>
                         <xsl:with-param name="link-desc" tunnel="yes" select="./linkDescription"/>
                         <xsl:with-param name="href" 
                                         tunnel="yes" 
-                                        select="concat($context-prefix, '/redirect/?oid=', ./targetItem/@oid)"/>
+                                        select="concat($context-prefix, 
+                                                       '/redirect/?oid=', 
+                                                       ./targetItem/@oid, 
+                                                       $params)"/>
                         <xsl:with-param name="target-item-title" 
                                         tunnel="yes" 
                                         select="./targetItem/title"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index c422b77f2..0442466b8 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -1489,7 +1489,9 @@
                 <xsl:with-param name="copy-attributes" 
                                 select="'type accept autocomplete autofocus checked disabled multiple name required size spellcheck tabindex'"/>
             </xsl:call-template>
-            <xsl:attribute name="value" select="$value"/>
+            <xsl:attribute name="value" select="if($value = '' and ./@value) 
+                                                then ./@value
+                                                else $value"/>
             
             <xsl:choose>
                 <xsl:when test="./@placeholder and ./@placeholder-module">