Author: jleroux
Date: Sat Jun 2 11:11:08 2012
New Revision: 1345485
URL:
http://svn.apache.org/viewvc?rev=1345485&view=revLog:
"Applied fix from trunk for revision: 1345484"
------------------------------------------------------------------------
r1345484 | jleroux | 2012-06-02 13:09:02 +0200 (sam., 02 juin 2012) | 3 lines
Revert r1345473, I will rather review and commit
https://issues.apache.org/jira/browse/OFBIZ-4916Thanks to Jacopo spotting this (was harmful but stupid, really the kind of errors I make when too tired, not enough focus:D )
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1345484
Modified: ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1345485&r1=1345484&r2=1345485&view=diff==============================================================================
--- ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Sat Jun 2 11:11:08 2012
@@ -355,7 +355,7 @@ $(function(){
<hr />
<div id="productImageBox">
- <#if productImageList?has_content && productImageList?has_content>
+ <#if productImageList != null && productImageList?has_content>
<#-- Product image/name/price -->
<div id="detailImageBox">
<#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL")?if_exists />