Author: lektran
Date: Sun May 9 01:20:13 2010
New Revision: 942486
URL:
http://svn.apache.org/viewvc?rev=942486&view=revLog:
Backported from trunk r942485:
Applied patch from BJ Freeman OFBIZ-3741, layoutSettings.VT_SHORTCUT_ICON was unable to take effect because layoutSettings.shortcutIcon always has content
Modified:
ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=942486&r1=942485&r2=942486&view=diff==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original)
+++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Sun May 9 01:20:13 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>" />
Locked
