holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Placeholders - avoid infinite recursion if apps have custom fields of other apps

Browse Source
This commit is contained in:
nathan 2021-10-12 15:44:48 -06:00
parent 9e2bb05ded
commit 7dba4b9284
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3079,6 +3079,12 @@ abstract class Merge
*/
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)
{
if(array_key_exists($field['type'], Api\Link::app_list()))
@ -3108,7 +3114,6 @@ abstract class Merge
public function get_placeholder_list($prefix = '')
{
$placeholders = [
'placeholders' => []
];
$this->add_customfield_placeholders($placeholders, $prefix);
@ -3212,7 +3217,6 @@ abstract class Merge
*/
public function show_replacements()
{
$template_name = 'api.show_replacements';
$content = $sel_options = $readonlys = $preserve = array();