cvs: pear /DB_DataObject_FormBuilder FormBuilder.php

justinpatrin Sat Apr 16 23:20:11 2005 EDT Modified files: /pear/DB_DataObject_FormBuilder FormBuilder.php Log: Fix problem in recent comment about enum bug I *could* change it back to how it was and allow different display values for enum options, but that seems like an annoying thing to do...most ENUMs are have the display value in the ENUM itself, as they should. Making people do 'value'=>'value' is annoying IMHO. http://cvs.php.net/diff.php/pear/DB_DataObject_FormBuilder/FormBuilder.php?r1=1.150&r2=1.151&ty=u Index: pear/DB_DataObject_FormBuilder/FormBuilder.php diff -u pear/DB_DataObject_FormBuilder/FormBuilder.php:1.150 pear/DB_DataObject_FormBuilder/FormBuilder.php:1.151 --- pear/DB_DataObject_FormBuilder/FormBuilder.php:1.150 Mon Apr 11 18:46:58 2005 +++ pear/DB_DataObject_FormBuilder/FormBuilder.php Sat Apr 16 23:20:10 2005 @@ -94,7 +94,7 @@ * @author Justin Patrin <papercrane@reversefold.com> * @copyright 1997-2005 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version $Id: FormBuilder.php,v 1.150 2005/04/11 22:46:58 justinpatrin Exp $ + * @version $Id: FormBuilder.php,v 1.151 2005/04/17 03:20:10 justinpatrin Exp $ * @link http://pear.php.net/package/DB_DataObject_FormBuilder * @see DB_DataObject, HTML_QuickForm */ @@ -1257,16 +1257,17 @@ $formValues[$key] = $this->_do->$key; if (!isset($element)) { if (isset($this->enumOptions[$key])) { - $options = array(); - foreach ($this->enumOptions[$key] as $value) { - $options[$value] = $value; - } + $options1 = $this->enumOptions[$key]; } else { - $options = call_user_func($this->enumOptionsCallback, $this->_do->__table, $key); - if (PEAR::isError($options)) { - return $options; + $options1 = call_user_func($this->enumOptionsCallback, $this->_do->__table, $key); + if (PEAR::isError($options1)) { + return $options1; } } + $options = array(); + foreach ($options1 as $value) { + $options[$value] = $value; + } if (in_array($key, $this->selectAddEmpty) || !$notNull) { $options = array_merge(array('' => $this->selectAddEmptyLabel), $options); }