From 8987ff7663e9010ac017c6698ccacbf979313913 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 19 Jan 2015 20:09:58 +0000
Subject: [PATCH] The Foundry CSS loader now uses conditional comments for IE
 hacks instead of using the user agent string transmitted by the User Agent to
 the server.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3095 8810af33-2d31-482b-a856-94f89814c4df
---
 .../content-items/assets/related-links.xsl    |  2 +-
 .../foundry/lib/template-tags/loaders.xsl     | 55 ++++++++++---------
 2 files changed, 29 insertions(+), 28 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 998c71fa3..e5e195472 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
@@ -63,7 +63,7 @@
                         <xsl:with-param name="link-desc" tunnel="yes" select="./linkDescription"/>
                         <xsl:with-param name="href" 
                                         tunnel="yes" 
-                                        select="concat($context-prefix, 
+                                        select="concat($context-prefix,
                                                        '/redirect/?oid=', 
                                                        ./targetItem/@oid, 
                                                        $params)"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
index a51673361..c0189d8cc 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
@@ -112,26 +112,28 @@
         <!-- Include IE Hacks only for very old IEs (IE 6) -->
         <!-- jensp 2014-09-16 This is copied from Mandalay. Maybe remove and relay and use 
         conditional comments in the other CSS files instead? -->
-        <xsl:if test="$msie_version >= '5' and $msie_version &lt; '7'">
-            <xsl:choose>
-                <xsl:when test="$css-files-map/css-files/application[@name=$application]">
-                    <xsl:for-each select="document(foundry:gen-path('conf/css-files.xml'))/css-files/application[@name=$application]/iehacks">
-                        <xsl:call-template name="foundry:load-css-file">
-                            <xsl:with-param name="filename" select="."/>
-                            <xsl:with-param name="media" select="./@media"/>
-                        </xsl:call-template>
-                    </xsl:for-each>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:for-each select="$css-files-map/css-files/default/iehacks">
-                        <xsl:call-template name="foundry:load-css-file">
-                            <xsl:with-param name="filename" select="."/>
-                            <xsl:with-param name="media" select="./@media"/>
-                        </xsl:call-template>
-                    </xsl:for-each>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:if>
+        
+        <xsl:value-of select="'&#x3c;!--[if lt IE 9]&#x3e;'" disable-output-escaping="yes"/>
+        <xsl:choose>
+            <xsl:when test="$css-files-map/css-files/application[@name=$application]">
+                <xsl:for-each select="$css-files-map/css-files/application[@name=$application]/iehacks">
+                    <xsl:call-template name="foundry:load-css-file">
+                        <xsl:with-param name="filename" select="."/>
+                        <xsl:with-param name="media" select="./@media"/>
+                    </xsl:call-template>
+                </xsl:for-each>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:for-each select="$css-files-map/css-files/default/iehacks">
+                    <xsl:call-template name="foundry:load-css-file">
+                        <xsl:with-param name="filename" select="."/>
+                        <xsl:with-param name="media" select="./@media"/>
+                    </xsl:call-template>
+                </xsl:for-each>
+            </xsl:otherwise>
+        </xsl:choose>
+        <xsl:value-of select="'&#x3c;![endif]--&#x3e;'" disable-output-escaping="yes"/>
+        
         
     </xsl:template>
     
@@ -341,12 +343,11 @@
         </foundry:doc-desc>
     </foundry:doc>
     <xsl:template match="load-html5shiv">
-        <xsl:value-of select="concat('
-        &lt;!--
-        &lt;!-[if lt IE 9]&gt;
-        &lt;script src=&quot;', $context-prefix, '/assets/html5shiv.js&quot;/&gt;
-        &lt;![endif]
-        --&gt;')"/>
+        <xsl:value-of disable-output-escaping="yes"
+                      select="concat('&#x0a;
+                        &lt;!--[if lt IE 9]&gt;&#x0a;
+                        &lt;script src=&quot;', $context-prefix, '/assets/html5shiv.js&quot;/&gt;&#x0a;
+                        &lt;![endif]--&gt;')"/>
     </xsl:template>
     
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>