CRM-14106 - Regex targeting the first part of if statements

[civicrm-core.git] / CRM / Report / Form / Case / Detail.php

diff --git a/CRM/Report/Form/Case/Detail.php b/CRM/Report/Form/Case/Detail.php
index 16fb5b5ead9ed25c2066a26d8319861ab668c205..3a68446e8a7863f2f2a908bb622bae59e04b3289 100644 (file)
--- a/CRM/Report/Form/Case/Detail.php
+++ b/CRM/Report/Form/Case/Detail.php
@@ -2,7 +2,7 @@
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -304,7 +304,7 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form {
           if ($tableName == 'civicrm_address') {
             $this->_addressField = TRUE;
           }
-          if (CRM_Utils_Array::value('required', $field) ||
+          if (!empty($field['required']) ||
             CRM_Utils_Array::value($fieldName, $this->_params['fields'])
           ) {
             if ($tableName == 'civicrm_email') {
@@ -550,7 +550,7 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form {
       $this->_relField = TRUE;
     }
 
-    if (CRM_Utils_Array::value('activity_date_time_relative', $this->_params) ||
+    if (!empty($this->_params['activity_date_time_relative']) ||
       CRM_Utils_Array::value('activity_date_time_from', $this->_params) ||
       CRM_Utils_Array::value('activity_date_time_to', $this->_params)
     ) {
@@ -558,7 +558,7 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form {
     }
 
     foreach (array_keys($this->_caseDetailExtra) as $field) {
-      if (CRM_Utils_Array::value($field, $this->_params['case_detail_extra'])) {
+      if (!empty($this->_params['case_detail_extra'][$field])) {
         $this->_includeCaseDetailExtra = TRUE;
         break;
       }