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.

Sign up for GitHub

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 undefined tpl variables #20813

Merged
merged 1 commit into from
Jul 8, 2021
Merged

Fix undefined tpl variables #20813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions templates/CRM/Admin/Form/Setting/Debugging.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
{ts}In addition to the settings on this screen, there are a number of settings you can add to your sites's settings file (civicrm.settings.php) to provide additional debugging information.{/ts} {docURL page="dev/tools/debugging/#changing-file-based-settings"}
</div>
<div class="crm-block crm-form-block crm-debugging-form-block">
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout">
{if $form.userFrameworkLogging}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout">
{if !empty($form.userFrameworkLogging)}
<tr class="crm-debugging-form-block-userFrameworkLogging">
<td class="label">{$form.userFrameworkLogging.label}</td>
<td>{$form.userFrameworkLogging.html}<br />
<span class="description">{ts}Set this value to <strong>Yes</strong> if you want CiviCRM error/debugging messages to appear in the Drupal error logs{/ts} {help id='userFrameworkLogging'}</span></td>
</tr>
{/if}
{/if}
<tr class="crm-debugging-form-block-debug">
<td class="label">{$form.debug_enabled.label}</td>
<td>{$form.debug_enabled.html}<br />
Expand All @@ -45,7 +45,7 @@
<td>{$form.assetCache.html}<br />
<span class="description">{ts}Store computed JS/CSS content in cache files? (Note: In "Auto" mode, the "Debug" setting will determine whether to activate the cache.){/ts}</span></td>
</tr>
</table>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
<div class="spacer"></div>
</table>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
<div class="spacer"></div>
</div>
6 changes: 3 additions & 3 deletions templates/CRM/Contact/Form/Task.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*}
{ts 1=$totalSelectedContacts}Number of selected contacts: %1{/ts}

{if $searchtype eq 'ts_sel'}
{if !empty($searchtype) && $searchtype eq 'ts_sel'}
<div id="popupContainer">
<div class="crm-block crm-form-block crm-search-form-block">
<table id="selectedRecords-{$group.id}" class="display crm-copy-fields crm-sortable">
Expand All @@ -32,7 +32,7 @@
<a href="#" id="popup-button" title="{ts}View Selected Contacts{/ts}">{ts}View Selected Contacts{/ts}</a>
{/if}

{if $searchtype eq 'ts_sel'}
{if !empty($searchtype) && $searchtype eq 'ts_sel'}
{literal}
<script type="text/javascript">
CRM.$(function($) {
Expand Down Expand Up @@ -73,7 +73,7 @@
{/literal}
{/if}

{if $rows}
{if !empty($rows)}
<div class="form-item">
<table width="30%">
<tr class="columnheader">
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Contact/Form/Task/EmailCommon.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<div class="content">{$form.saveTemplateName.html|crmAddClass:huge}</div>
</div>

{if ! $noAttach}
{if empty($noAttach)}
{include file="CRM/Form/attachment.tpl"}
{/if}

Expand Down
8 changes: 4 additions & 4 deletions templates/CRM/Form/attachment.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
</td>
</tr>
{elseif $action NEQ 4}
{if $context EQ 'pcpCampaign'}
{if !empty($context) && $context EQ 'pcpCampaign'}
{capture assign=attachTitle}{ts}Include a Picture or an Image{/ts}{/capture}
{else}
{capture assign=attachTitle}{ts}Attachment(s){/ts}{/capture}
{/if}
{if !$noexpand}
<div class="crm-accordion-wrapper {if $context NEQ 'pcpCampaign' AND !$currentAttachmentInfo}collapsed{/if}">
{if empty($noexpand)}
<div class="crm-accordion-wrapper {if (empty($context) || $context NEQ 'pcpCampaign') AND empty($currentAttachmentInfo)}collapsed{/if}">
<div class="crm-accordion-header">
{$attachTitle}
</div><!-- /.crm-accordion-header -->
Expand All @@ -42,7 +42,7 @@
<div id="attachments">
<table class="form-layout-compressed">
{if $form.attachFile_1}
{if $context EQ 'pcpCampaign'}
{if !empty($context) && $context EQ 'pcpCampaign'}
<div class="description">{ts}You can upload a picture or image to include on your page. Your file should be in .jpg, .gif, or .png format. Recommended image size is 250 x 250 pixels. Images over 360 pixels wide will be automatically resized to fit.{/ts}</div>
{/if}
<tr>
Expand Down