From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 14 Jun 2021 07:39:02 +0000 (+0000)
Subject: [php8-compact] Further test fixes for php8
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4a167d97a23c2c34de03f300c69acd0f9b50aeae;p=civicrm-core.git

[php8-compact] Further test fixes for php8
---

diff --git a/CRM/Core/Form/Date.php b/CRM/Core/Form/Date.php
index 24ff85f3a3..db4ac7019c 100644
--- a/CRM/Core/Form/Date.php
+++ b/CRM/Core/Form/Date.php
@@ -165,12 +165,12 @@ class CRM_Core_Form_Date {
     &$form,
     $fieldName,
     $selector,
-    $from = '_from',
-    $to = '_to',
-    $fromLabel = 'From:',
-    $required = FALSE,
-    $dateFormat = 'searchDate',
-    $displayTime = FALSE,
+    $from,
+    $to,
+    $fromLabel,
+    $required,
+    $dateFormat,
+    $displayTime,
     $attributes
   ) {
     CRM_Core_Error::deprecatedFunctionWarning('function will be removed');
diff --git a/templates/CRM/Form/body.tpl b/templates/CRM/Form/body.tpl
index 01c4c92273..3baf72cacd 100644
--- a/templates/CRM/Form/body.tpl
+++ b/templates/CRM/Form/body.tpl
@@ -32,7 +32,7 @@
 {/if}
 
 {* Add all the form elements sent in by the hook  - formerly used by civiDiscount, now deprecated*}
-{if $beginHookFormElements}
+{if !empty($beginHookFormElements)}
   <table class="form-layout-compressed">
   {foreach from=$beginHookFormElements key=dontCare item=hookFormElement}
       <tr><td class="label nowrap">{$form.$hookFormElement.label}</td><td>{$form.$hookFormElement.html}</td></tr>