Merge pull request #19438 from colemanw/afformDropAttrSupport

[civicrm-core.git] / CRM / Utils / Chart.php

diff --git a/CRM/Utils/Chart.php b/CRM/Utils/Chart.php
index 88a075085e020922f4d72b5603e6afe8a1991fa4..9a5b90a71c51a9571f6239170e60f1dcc03f123c 100644 (file)
--- a/CRM/Utils/Chart.php
+++ b/CRM/Utils/Chart.php
@@ -200,19 +200,19 @@ class CRM_Utils_Chart {
         'legend' => "$legend " . CRM_Utils_Array::value('legend', $rows, ts('Contribution')) . ' ' . ts('Summary'),
         'values' => $graph[0],
         'multiValues' => $graph,
-        'barKeys' => CRM_Utils_Array::value('barKeys', $rows, []),
+        'barKeys' => $rows['barKeys'] ?? [],
       ];
     }
 
     // rotate the x labels.
-    $chartData['xLabelAngle'] = CRM_Utils_Array::value('xLabelAngle', $rows, 0);
+    $chartData['xLabelAngle'] = $rows['xLabelAngle'] ?? 0;
     if (!empty($rows['tip'])) {
       $chartData['tip'] = $rows['tip'];
     }
 
     // legend
-    $chartData['xname'] = CRM_Utils_Array::value('xname', $rows);
-    $chartData['yname'] = CRM_Utils_Array::value('yname', $rows);
+    $chartData['xname'] = $rows['xname'] ?? NULL;
+    $chartData['yname'] = $rows['yname'] ?? NULL;
 
     // carry some chart params if pass.
     foreach ([