Merge pull request #19115 from totten/master-api4-perm

[civicrm-core.git] / CRM / Contribute / Form / ContributionCharts.php

diff --git a/CRM/Contribute/Form/ContributionCharts.php b/CRM/Contribute/Form/ContributionCharts.php
index 3b498b6b1abfccb2c680d8a81935be45d412c496..84da27929de7342d8db1d3daab5407d0f2577304 100644 (file)
--- a/CRM/Contribute/Form/ContributionCharts.php
+++ b/CRM/Contribute/Form/ContributionCharts.php
@@ -139,7 +139,7 @@ class CRM_Contribute_Form_ContributionCharts extends CRM_Core_Form {
     $monthlyChart = $yearlyChart = FALSE;
 
     foreach ($chartData as $chartKey => & $values) {
-      $chartValues = CRM_Utils_Array::value('values', $values);
+      $chartValues = $values['values'] ?? NULL;
 
       if (!is_array($chartValues) || empty($chartValues)) {
         continue;
@@ -214,7 +214,7 @@ class CRM_Contribute_Form_ContributionCharts extends CRM_Core_Form {
     // finally assign this chart data to template.
     $this->assign('hasYearlyChart', $yearlyChart);
     $this->assign('hasByMonthChart', $monthlyChart);
-    $this->assign('hasChart', empty($chartData) ? FALSE : TRUE);
+    $this->assign('hasChart', !empty($chartData));
     $this->assign('chartData', json_encode($chartData ?? []));
   }