diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php index 4ee798b9b8..afd34c2e75 100644 --- a/etemplate/inc/class.boetemplate.inc.php +++ b/etemplate/inc/class.boetemplate.inc.php @@ -384,8 +384,8 @@ */ function complete_array_merge($old,$new) { - reset($new); - while (list($k,$v) = each($new)) + @reset($new); + while (list($k,$v) = @each($new)) { if (!is_array($v) || !isset($old[$k]) || $k[0] == '_') { diff --git a/etemplate/inc/class.html.inc.php b/etemplate/inc/class.html.inc.php index 3fc0704186..908d873902 100644 --- a/etemplate/inc/class.html.inc.php +++ b/etemplate/inc/class.html.inc.php @@ -23,7 +23,7 @@ class html $this->prefered_img_title = stristr($HTTP_USER_AGENT,'konqueror') ? 'title' : 'alt'; } - function input_hidden($vars,$value='') + function input_hidden($vars,$value='',$ignore_empty=True) { if (!is_array($vars)) { @@ -33,7 +33,7 @@ class html { if (is_array($value)) $value = serialize($value); $del = strchr($value,'"') ? "'" : '"'; - if ($value && !($name == 'filter' && $value == 'none')) // dont need to send all the empty vars + if (!$ignore_empty || $value && !($name == 'filter' && $value == 'none')) // dont need to send all the empty vars { $html .= "\n"; } @@ -95,9 +95,9 @@ class html return "\n"; } - function form($content,$hidden_vars,$url,$url_vars='',$method='POST') + function form($content,$hidden_vars,$url,$url_vars='',$name='',$method='POST') { - $html = "