Merge in 5.24

[civicrm-core.git] / api / api.php

diff --git a/api/api.php b/api/api.php
index cbb4856f4cbaa4514e55b290c6bc93b5e4849a6e..845ab3d8b579022b1bdd33ad6f9fe68a272f1151 100644 (file)
--- a/api/api.php
+++ b/api/api.php
@@ -262,7 +262,7 @@ function _civicrm_api_replace_variable($value, $parentResult, $separator) {
       if (array_key_exists($fieldname, $parentResult) && is_array($parentResult[$fieldname])) {
         $arrayLocation = $parentResult[$fieldname];
         foreach ($stringParts as $key => $innerValue) {
-          $arrayLocation = CRM_Utils_Array::value($innerValue, $arrayLocation);
+          $arrayLocation = $arrayLocation[$innerValue] ?? NULL;
         }
         $value = $arrayLocation;
       }