svn commit: r1345554 - in /ofbiz/branches/release12.04: ./ specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl

Author: jleroux
Date: Sat Jun  2 18:53:14 2012
New Revision: 1345554

URL: http://svn.apache.org/viewvc?rev=1345554&view=rev
Log:
"Applied fix from trunk for revision: 1345553"
------------------------------------------------------------------------
r1345553 | jleroux | 2012-06-02 20:52:30 +0200 (sam., 02 juin 2012) | 1 line

Forgot to commit this file with r1345532  
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1345553

Modified: ofbiz/branches/release12.04/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl?rev=1345554&r1=1345553&r2=1345554&view=diff
==============================================================================
--- ofbiz/branches/release12.04/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl (original)
+++ ofbiz/branches/release12.04/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl Sat Jun  2 18:53:14 2012
@@ -91,7 +91,7 @@ under the License.
                  <#list refundArray as refundAr>
                     <#assign refund = "">
                     <option value="${refundAr.getRefundOption()?if_exists}"
-                    <#if refund!=null && refund.equalsIgnoreCase(refundAr.getRefundOption())>selected="select"</#if>>
+                    <#if refund?? && refund.equalsIgnoreCase(refundAr.getRefundOption())>selected="select"</#if>>
                     ${refundArray[j].getDescription()?if_exists}</option>
                  </#list>
                  </#if>
@@ -113,7 +113,7 @@ under the License.
                 <#list paidByArray as paidBy>
                     <#assign shippingCostPaidBy = "">
                     <option value="${paidBy.getShippingCostPaidByOption()?if_exists}"
-                    <#if shippingCostPaidBy!=null && shippingCostPaidBy.equalsIgnoreCase(paidBy.getShippingCostPaidByOption()?if_exists)>selected="select"</#if>>
+                    <#if shippingCostPaidBy?? && shippingCostPaidBy.equalsIgnoreCase(paidBy.getShippingCostPaidByOption()?if_exists)>selected="select"</#if>>
                     ${paidBy.getDescription()?if_exists}</option>
                 </#list>
                 </#if>