cvs: pear /DB_DataObject_FormBuilder/FormBuilder QuickForm.php

justinpatrin Fri May 27 12:23:45 2005 EDT Modified files: /pear/DB_DataObject_FormBuilder/FormBuilder QuickForm.php Log: Add rules, errors, and required of form to append to current form http://cvs.php.net/diff.php/pear/DB_DataObject_FormBuilder/FormBuilder/QuickForm.php?r1=1.48&r2=1.49&ty=u Index: pear/DB_DataObject_FormBuilder/FormBuilder/QuickForm.php diff -u pear/DB_DataObject_FormBuilder/FormBuilder/QuickForm.php:1.48 pear/DB_DataObject_FormBuilder/FormBuilder/QuickForm.php:1.49 --- pear/DB_DataObject_FormBuilder/FormBuilder/QuickForm.php:1.48 Fri May 27 01:29:14 2005 +++ pear/DB_DataObject_FormBuilder/FormBuilder/QuickForm.php Fri May 27 12:23:45 2005 @@ -11,7 +11,7 @@ * @license http://www.php.net/license/3_0.txt PHP License 3.0 * @author Markus Wolff <mw21st@php.net> * @author Justin Patrin <papercrane@reversefold.com> - * @version $Id: QuickForm.php,v 1.48 2005/05/27 05:29:14 justinpatrin Exp $ + * @version $Id: QuickForm.php,v 1.49 2005/05/27 16:23:45 justinpatrin Exp $ */ require_once ('HTML/QuickForm.php'); @@ -210,8 +210,6 @@ */ function &_createFormObject($formName, $method, $action, $target) { - // If there is an existing QuickForm object, and the form object should not just be - // appended, use that one. If not, make a new one. if (!is_a($this->_form, 'html_quickform')) { $this->_form =& new HTML_QuickForm($formName, $method, $action, $target); } @@ -827,6 +825,9 @@ while (list($elNum, $element) = each($this->_appendForm->_elements)) { $this->_addElement($element); } + $form->_errors = array_merge($form->_errors, $this->_appendForm->_errors); + $form->_rules = array_merge($form->_rules, $this->_appendForm->_rules); + $form->_required = array_merge($form->_required, $this->_appendForm->_required); } }