extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Api - Fix nested custom field merging

Browse Source
This commit is contained in:
nathangray 2017-12-01 11:58:44 -07:00
parent 2df24a3aaf
commit 6506418e61
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/Storage/Merge.php
View File

@ -1427,6 +1427,9 @@ abstract class Merge
// Get replacements for that application // Get replacements for that application
if(!$app_replacements[$field]) if(!$app_replacements[$field])
{ {
// If we send the real content it can result in infinite loop of lookups
// so we send only the used fields
$content = $expand_sub_cfs[$field] ? $expand_sub_cfs[$field] : '';
$app_replacements[$field] = $this->get_app_replacements($field_app, $values['#'.$field], $content); $app_replacements[$field] = $this->get_app_replacements($field_app, $values['#'.$field], $content);
} }
$replacements[$placeholders[$index]] = $app_replacements[$field]['$$'.$sub[$index].'$$']; $replacements[$placeholders[$index]] = $app_replacements[$field]['$$'.$sub[$index].'$$'];