cvs: pear /HTML_QuickForm_Controller Controller.php package.xml

avb Tue Mar 16 05:25:16 2004 EDT Modified files: /pear/HTML_QuickForm_Controller Controller.php package.xml Log: Applied patch from #929, prepare release notes for 1.0.2 http://cvs.php.net/diff.php/pear/HTML_QuickForm_Controller/Controller.php?r1=1.7&r2=1.8&ty=u Index: pear/HTML_QuickForm_Controller/Controller.php diff -u pear/HTML_QuickForm_Controller/Controller.php:1.7 pear/HTML_QuickForm_Controller/Controller.php:1.8 --- pear/HTML_QuickForm_Controller/Controller.php:1.7 Tue Mar 2 16:15:52 2004 +++ pear/HTML_QuickForm_Controller/Controller.php Tue Mar 16 05:25:09 2004 @@ -17,7 +17,7 @@ // | Bertrand Mansion <bmansion@mamasam.com> | // +----------------------------------------------------------------------+ // -// $Id: Controller.php,v 1.7 2004/03/02 21:15:52 avb Exp $ +// $Id: Controller.php,v 1.8 2004/03/16 10:25:09 avb Exp $ require_once 'HTML/QuickForm/Page.php'; @@ -32,7 +32,7 @@ * * @author Alexey Borzov <avb@php.net> * @package HTML_QuickForm_Controller - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ */ class HTML_QuickForm_Controller { @@ -411,8 +411,12 @@ foreach ($pages as $page) { // skip elements representing actions foreach ($data['values'][$page] as $key => $value) { - if (!preg_match('/^_qf_/', $key)) { - $values[$key] = $value; + if (0 !== strpos($key, '_qf_')) { + if (isset($values[$key])) { + $values[$key] = HTML_QuickForm::arrayMerge($values[$key], $value); + } else { + $values[$key] = $value; + } } } } http://cvs.php.net/diff.php/pear/HTML_QuickForm_Controller/package.xml?r1=1.8&r2=1.9&ty=u Index: pear/HTML_QuickForm_Controller/package.xml diff -u pear/HTML_QuickForm_Controller/package.xml:1.8 pear/HTML_QuickForm_Controller/package.xml:1.9 --- pear/HTML_QuickForm_Controller/package.xml:1.8 Thu Dec 11 09:52:58 2003 +++ pear/HTML_QuickForm_Controller/package.xml Tue Mar 16 05:25:09 2004 @@ -29,12 +29,16 @@ </maintainer> </maintainers> <release> - <version>1.0.1</version> - <date>2003-12-11</date> + <version>1.0.2</version> + <date>2004-03-??</date> <state>stable</state> <notes> -* Added a new example showing how to proceed to either of the two pages - based on user input (Donald Lobo). +* HTML_QuickForm_Controller does not rely on form's "name" attribute anymore + (XHTML compliance fix, see also bug #925) +* Use new HTML_QuickForm::arrayMerge() method in place of PHP's builtin + array_merge(), depend on QuickForm 3.2.2 +* Applied patch from #929, exportValues() does not overwrite elements with + the same names from different pages. </notes> <filelist> <dir name="/" baseinstalldir="HTML/QuickForm"> @@ -63,11 +67,20 @@ </dir> </filelist> <deps> - <dep type="pkg" rel="ge" version="3.2">HTML_QuickForm</dep> + <dep type="pkg" rel="ge" version="3.2.2">HTML_QuickForm</dep> </deps> </release> <changelog> <release> + <version>1.0.1</version> + <date>2003-12-11</date> + <state>stable</state> + <notes> +* Added a new example showing how to proceed to either of the two pages + based on user input (Donald Lobo). + </notes> + </release> + <release> <version>1.0</version> <date>2003-11-05</date> <state>stable</state>