svn commit: r942485 - /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r942485 - /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl

lektran
Author: lektran
Date: Sun May  9 01:18:02 2010
New Revision: 942485

URL: http://svn.apache.org/viewvc?rev=942485&view=rev
Log:
Applied patch from BJ Freeman OFBIZ-3741, layoutSettings.VT_SHORTCUT_ICON was unable to take effect because layoutSettings.shortcutIcon always has content

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=942485&r1=942484&r2=942485&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Sun May  9 01:18:02 2010
@@ -20,10 +20,10 @@ under the License.
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)?if_exists}</title>
-  <#if layoutSettings.shortcutIcon?has_content>
-    <#assign shortcutIcon = layoutSettings.shortcutIcon/>
-  <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
+  <#if layoutSettings.VT_SHORTCUT_ICON?has_content>
     <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/>
+  <#elseif layoutSettings.shortcutIcon?has_content>
+    <#assign shortcutIcon = layoutSettings.shortcutIcon/>
   </#if>
   <#if shortcutIcon?has_content>
     <link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>" />