Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix php7.2 notices on trying to count null #13111

Merged
merged 1 commit into from
Nov 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/CRM/Contribute/Form/Contribution/Confirm.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@
</div>
{/if}

{if $onbehalfProfile|@count}
{if $onbehalfProfile && $onbehalfProfile|@count}
<div class="crm-group onBehalf_display-group label-left crm-profile-view">
{include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf'}
</div>
{/if}

{if $honoreeProfileFields|@count}
{if $honoreeProfileFields && $honoreeProfileFields|@count}
<div class="crm-group honor_block-group">
<div class="header-dark">
{$soft_credit_type}
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Contribute/Form/Contribution/Main.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
{include file="CRM/Contribute/Form/Contribution/PremiumBlock.tpl" context="makeContribution"}
</div>

{if $honoreeProfileFields|@count}
{if $honoreeProfileFields && $honoreeProfileFields|@count}
<fieldset class="crm-public-form-item crm-group honor_block-group">
{crmRegion name="contribution-soft-credit-block"}
<legend>{$honor_block_title}</legend>
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<div class="crm-public-form-item" id="on-behalf-block">
{crmRegion name="onbehalf-block"}
{if $onBehalfOfFields|@count}
{if $onBehalfOfFields && $onBehalfOfFields|@count}
<fieldset>
<legend>{$fieldSetTitle}</legend>
{if $form.org_option}
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,13 @@
</div>
{/if}

{if $onbehalfProfile|@count}
{if $onbehalfProfile && $onbehalfProfile|@count}
<div class="crm-group onBehalf_display-group label-left crm-profile-view">
{include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf'}
</div>
{/if}

{if $honoreeProfileFields|@count}
{if $honoreeProfileFields && $honoreeProfileFields|@count}
<div class="crm-group honor_block-group">
<div class="header-dark">
{$soft_credit_type}
Expand Down