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

Placeholders list common UI: different recursion check for better results

Browse Source 
This one still puts simple customfields in, but just skips the linked apps cfs
This commit is contained in:
nathan 2021-10-13 08:39:23 -06:00
parent bcfcc51398
commit 047b86f38b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3079,15 +3079,10 @@ abstract class Merge
*/ */
protected function add_customfield_placeholders(&$placeholders, $prefix = '') protected function add_customfield_placeholders(&$placeholders, $prefix = '')
{ {
// Avoid recursing between custom fields of different apps
if(substr_count($prefix, '#') > 1)
{
return;
}
foreach(Customfields::get($this->get_app()) as $name => $field) foreach(Customfields::get($this->get_app()) as $name => $field)
{ {
if(array_key_exists($field['type'], Api\Link::app_list())) // Avoid recursing between custom fields of different apps
if(array_key_exists($field['type'], Api\Link::app_list()) && substr_count($prefix, '#') == 0)
{ {
$app = self::get_app_class($field['type']); $app = self::get_app_class($field['type']);
if($app) if($app)