cvs: pear /HTML_Template_Flexy Flexy.php /HTML_Template_Flexy/Flexy Factory.php

alan_k Thu Nov 13 09:23:01 2003 EDT Modified files: /pear/HTML_Template_Flexy Flexy.php /pear/HTML_Template_Flexy/Flexy Factory.php Log: fix for radio buttons Index: pear/HTML_Template_Flexy/Flexy.php diff -u pear/HTML_Template_Flexy/Flexy.php:1.49 pear/HTML_Template_Flexy/Flexy.php:1.50 --- pear/HTML_Template_Flexy/Flexy.php:1.49 Mon Nov 10 21:23:57 2003 +++ pear/HTML_Template_Flexy/Flexy.php Thu Nov 13 09:23:00 2003 @@ -55,7 +55,7 @@ * * * -* @version $Id: Flexy.php,v 1.49 2003/11/11 02:23:57 alan_k Exp $ +* @version $Id: Flexy.php,v 1.50 2003/11/13 14:23:00 alan_k Exp $ */ class HTML_Template_Flexy { @@ -546,6 +546,11 @@ if (!$original) { return $new; } + + if (!$new) { + return $original; + } + if ($new->tag && ($new->tag != $original->tag)) { $original->tag = $new->tag; } @@ -561,8 +566,11 @@ $original->children = $new->children; } - foreach ($new->attributes as $key => $value) { - $original->attributes[$key] = $value; + if (is_array($new->attributes)) { + + foreach ($new->attributes as $key => $value) { + $original->attributes[$key] = $value; + } } $original->prefix = $new->prefix; $original->suffix = $new->suffix; Index: pear/HTML_Template_Flexy/Flexy/Factory.php diff -u pear/HTML_Template_Flexy/Flexy/Factory.php:1.4 pear/HTML_Template_Flexy/Flexy/Factory.php:1.5 --- pear/HTML_Template_Flexy/Flexy/Factory.php:1.4 Fri Jul 25 22:31:16 2003 +++ pear/HTML_Template_Flexy/Flexy/Factory.php Thu Nov 13 09:23:01 2003 @@ -16,7 +16,7 @@ // | Authors: nobody <nobody@localhost> | // +----------------------------------------------------------------------+ // -// $Id: Factory.php,v 1.4 2003/07/26 02:31:16 alan_k Exp $ +// $Id: Factory.php,v 1.5 2003/11/13 14:23:01 alan_k Exp $ // // Factory tools for managing groups of HTML_Elements // @@ -96,8 +96,12 @@ */ function setErrors($ret,$set,$format='<span class="error">%s</span>') { - - + // check what you send this.. !!! + if (!is_array($set)) { + PEAR::raiseError( + 'invalid arguments "$set" (should be an array) sent to HTML_Template_Flexy_Factory::setErrors', + 0, PEAR_ERROR_DIE); + } foreach($set as $k=>$v) { if (!$v) { continue;