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

stop etemplate_widget_template::instance from returning a stdClass object for a not found template after content-expanding, leading to a fatal error in etemplate_widget line 338

Browse Source
This commit is contained in:
Ralf Becker 2015-03-17 14:07:20 +00:00
parent 2bd096f6e2
commit 387d5053dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/inc/class.etemplate_widget_template.inc.php
View File

@ -76,9 +76,9 @@ class etemplate_widget_template extends etemplate_widget
if (is_array(self::$request->content))
{
$expand_name = self::expand_name($name, '','','','',self::$cont);
if($expand_name && $expand_name != $name)
if ($expand_name && $expand_name != $name &&
($template = self::instance($expand_name, $template_set, $version, $load_via)))
{
$template = self::instance($expand_name, $template_set, $version, $load_via);
// Remember original, un-expanded name in case content changes while still cached
$template->original_name = $name;
return $template;