Merge pull request #22449 from mattwire/phpnotices

[civicrm-core.git] / templates / CRM / common / formButtons.tpl

diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index f00a9747839e6c324744a8c25eb8f387c7e1573a..0652d10b45e8a07184173a4ae782c2e314209123 100644 (file)
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -10,7 +10,7 @@
 
 {crmRegion name='form-buttons'}
 {* Loops through $linkButtons and assigns html "a" (link) buttons to the template. Used for additional entity functions such as "Move to Case" or "Renew Membership" *}
-{if !empty($linkButtons)}
+{if $linkButtons}
   {foreach from=$linkButtons item=linkButton}
     {if $linkButton.accessKey}
       {capture assign=accessKey}accesskey="{$linkButton.accessKey}"{/capture}
@@ -24,7 +24,7 @@
       {capture assign=linkname}name="{$linkButton.ref}"{/capture}
     {else}{capture assign=linkname}name="{$linkButton.name}"{/capture}
     {/if}
-    <a class="button" {$linkname} href="{crmURL p=$linkButton.url q=$linkButton.qs}" {$accessKey} {$linkButton.extra}><span>{$icon}{$linkButton.title}</span></a>
+    <a class="button" {$linkname} href="{crmURL p=$linkButton.url q=$linkButton.qs}" {$accessKey} {$linkButton.extra}><span>{$icon|smarty:nodefaults}{$linkButton.title}</span></a>
   {/foreach}
 {/if}