From 7d33eb610a18c4d4705a03436c644da36e1d1b0d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 26 Aug 2011 13:30:05 +0000 Subject: [PATCH] partially reverted r36310 as it has side-effects on the nextmatches widget (in actions and selected rows) --- etemplate/inc/class.etemplate.inc.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php index 6e7ce1fee7..9d96c541c6 100644 --- a/etemplate/inc/class.etemplate.inc.php +++ b/etemplate/inc/class.etemplate.inc.php @@ -1122,28 +1122,12 @@ class etemplate extends boetemplate { $readonlys[$name] = true; } - $cell_name = $cell['name']; $extra_label = $this->extensionPreProcess($type,$form_name,$value,$cell,$readonlys[$name]); $readonly = $cell['readonly'] !== false && ($readonly || $cell['readonly']); // might be set or unset (===false) by extension -//echo "

set_array(\$content, '$name', ".array2string($value).")

\n"; + self::set_array($content,$name,$value); - // if widget changes the name (eg. by new widget-transformer), reevaluate name, form_name and value - if ($cell['name'] && $cell['name'] != $cell_name) - { - $name = $this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content); - // allow names like "tabs=one|two|three", which will be equal to just "tabs" - // eg. for tabs to use a name independent of the tabs contained - if (is_string($name) && strpos($name,'=') !== false) - { - list($name) = explode('=',$name); - } - $form_name = self::form_name($cname,$name); - - $value = $this->get_array($content,$name); - } - if ($cell['type'] == $type.'-'.$sub_type) break; // stop if no further type-change list($type,$sub_type) = explode('-',$cell['type']);