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

Get nextmatch working again after submit

Browse Source
This commit is contained in:
Nathan Gray 2012-05-15 21:43:05 +00:00
parent f280a38ed6
commit 4abef611b5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -742,6 +742,14 @@ class etemplate_widget_nextmatch extends etemplate_widget
} }
} }
$params[0] = $old_param0; $params[0] = $old_param0;
// Prevent troublesome keys from breaking the nextmatch
// TODO: Figure out where these come from
foreach(array('$row','${row}', '$', '0','1','2') as $key)
{
if(is_array(self::$request->content[$cname])) unset(self::$request->content[$cname][$key]);
if(is_array(self::$request->preserve[$cname])) unset(self::$request->preserve[$cname][$key]);
}
} }
} }

2
etemplate/inc/class.etemplate_widget_transformer.inc.php
View File

@ -104,7 +104,7 @@ abstract class etemplate_widget_transformer extends etemplate_widget
error_log(__METHOD__."() $this has no id!"); error_log(__METHOD__."() $this has no id!");
return; return;
} }
$attrs['value'] = $value =& self::get_array(self::$request->content, $form_name); $attrs['value'] = $value =& self::get_array(self::$request->content, $form_name, false, true);
$attrs['type'] = $this->type; $attrs['type'] = $this->type;
$attrs['id'] = $this->id; $attrs['id'] = $this->id;