CRM-16542 fix - PayPal Express woes on 4.6

https://issues.civicrm.org/jira/browse/CRM-16542

diff --git a/templates/CRM/Core/BillingBlock.tpl b/templates/CRM/Core/BillingBlock.tpl
index abf23e86f688c0941f448761d21503eedd9af1de..f6c4c830cf785b6bbbb596a250ec43d5d39d3321 100644 (file)
--- a/templates/CRM/Core/BillingBlock.tpl
+++ b/templates/CRM/Core/BillingBlock.tpl
@@ -32,7 +32,7 @@
       </legend>
       {if $form.$expressButtonName}
         {include file= "CRM/Core/paypalexpress.tpl"}
-      {/if}
+      {elseif $paymentProcessor.billing_mode & 1}
       <div class="crm-section billing_mode-section {$paymentTypeName}_info-section">
         {foreach from=$paymentFields item=paymentField}
           <div class="crm-section {$form.$paymentField.name}-section">
@@ -49,9 +49,10 @@
           </div>
         {/foreach}
       </div>
+     {/if}
     </fieldset>
   {/if}
-  {if $billingDetailsFields|@count}
+  {if $billingDetailsFields|@count && !$form.$expressButtonName}
     {if $profileAddressFields}
       <input type="checkbox" id="billingcheckbox" value="0">
       <label for="billingcheckbox">{ts}My billing address is the same as above{/ts}</label>