Merge pull request #18963 from samuelsov/nli18n

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

diff --git a/CRM/Utils/Chart.php b/CRM/Utils/Chart.php
index c8745fa0a5f0b745c958bbacea851f0311e43480..9a5b90a71c51a9571f6239170e60f1dcc03f123c 100644 (file)
--- a/CRM/Utils/Chart.php
+++ b/CRM/Utils/Chart.php
@@ -205,14 +205,14 @@ class CRM_Utils_Chart {
     }
 
     // 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 ([