extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-12 08:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Etemplate: Fix sub-templates not expanded and children not processed if id is set but does not expand

Browse Source
This commit is contained in:
nathangray 2020-11-04 16:10:09 -07:00
parent 1047abe80b
commit 74ffe2dc10
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Etemplate/Widget/Template.php
View File

@ -247,6 +247,10 @@ class Template extends Etemplate\Widget
// Check for template from content, and run over it
// templates included via template tag have their name to load them from in attribute "template"
$expand_name = self::expand_name($this->id ? $this->id : $this->attrs['template'], '','','','',self::$request->content);
if(!$expand_name && $this->id && $this->attrs['template'])
{
$expand_name = $this->attrs['template'];
}
if($this->original_name)
{
$expand_name = self::expand_name($this->original_name, '','','','',self::$request->content);