svn commit: r790104 - /ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl

[mor-2]

Author: mor
Date: Wed Jul  1 10:37:21 2009
New Revision: 790104

URL: http://svn.apache.org/viewvc?rev=790104&view=rev
Log:
Applied fix from trunk revision: 790101
String wrapped the styleSheet and javaScript context variable as earlier they were causing new session to be created.
Applied patch from Arun Patidar, part of OFBIZ-2672 (https://issues.apache.org/jira/browse/OFBIZ-2672)

Modified:
    ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=790104&r1=790103&r2=790104&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Wed Jul  1 10:37:21 2009
@@ -28,7 +28,7 @@
     <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/>
   </#if>
   <#if shortcutIcon?has_content>
-    <link rel="shortcut icon" href="<@ofbizContentUrl>${shortcutIcon}</@ofbizContentUrl>" />
+    <link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>" />
   </#if>
   <#if layoutSettings.javaScripts?has_content>
     <#--layoutSettings.javaScripts is a list of java scripts. -->
@@ -37,35 +37,35 @@
     <#list layoutSettings.javaScripts as javaScript>
       <#if javaScriptsSet.contains(javaScript)>
         <#assign nothing = javaScriptsSet.remove(javaScript)/>
-        <script type="text/javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script>
+        <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
       </#if>
     </#list>
   </#if>
   <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
     <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
-      <script type="text/javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script>
+      <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
     </#list>
   </#if>
   <#if layoutSettings.styleSheets?has_content>
     <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
     <#list layoutSettings.styleSheets as styleSheet>
-      <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
+      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
     </#list>
   </#if>
   <#if layoutSettings.VT_STYLESHEET?has_content>
     <#list layoutSettings.VT_STYLESHEET as styleSheet>
-      <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
+      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
     </#list>
   </#if>
   <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
     <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
     <#list layoutSettings.rtlStyleSheets as styleSheet>
-      <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
+      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
     </#list>
   </#if>
   <#if layoutSettings.VT_RTL_STYLESHEET?has_content && langDir == "rtl">
     <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
-      <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
+      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
     </#list>
   </#if>
   ${layoutSettings.extraHead?if_exists}
@@ -77,11 +77,11 @@
 
   <#-- Append CSS for catalog -->
   <#if catalogStyleSheet?exists>
-    <link rel="stylesheet" href="${catalogStyleSheet}" type="text/css"/>
+    <link rel="stylesheet" href="${StringUtil.wrapString(catalogStyleSheet)}" type="text/css"/>
   </#if>
   <#-- Append CSS for tracking codes -->
   <#if sessionAttributes.overrideCss?exists>
-    <link rel="stylesheet" href="${sessionAttributes.overrideCss}" type="text/css"/>
+    <link rel="stylesheet" href="${StringUtil.wrapString(sessionAttributes.overrideCss)}" type="text/css"/>
   </#if>
   <#-- Meta tags if defined by the page action -->
   <#if metaDescription?exists>