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

fixed changing of settings (eg. template set) did not work anymore reported by Christoph Kaulich

Browse Source 
caused by always breaking reference from attribute values. Now reference is only broken, if attribute value needs expanding (because it contains @ or $)
This commit is contained in:
Ralf Becker 2014-05-22 09:39:16 +00:00
parent 6ed0d09212
commit f203703e42
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/inc/class.etemplate_widget.inc.php
View File

@ -179,7 +179,9 @@ class etemplate_widget
$template = clone($this);
$cloned = true; // only clone it once, otherwise we loose attributes!
}
$value = (string)$reader->value;
// $reader->value is an object and therefore assigned by reference
// this is important to not loose content when validating dynamic generated tabs as in settings!
$template->attrs[$reader->name] = $value = $reader->value;
// expand attributes values, otherwise eg. validation can not use attrs referencing to content
if ($value[0] == '@' || strpos($value, '$') !== false)
@ -187,7 +189,6 @@ class etemplate_widget
$value = self::expand_name($value, null, null, null, null,
isset(self::$cont) ? self::$cont : self::$request->content);
}
$template->attrs[$reader->name] = $value;
// split legacy options
if ($legacy_options && $reader->name == 'options')