cvs: pear /DB_DataObject_FormBuilder FormBuilder.php
| From: | Markus Wolff | Date: | Mon, 15 Sep 2003 21:03:54 +0000 |
| Subject: | cvs: pear /DB_DataObject_FormBuilder FormBuilder.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-12759@lists.php.net to get a copy of this message | ||
mw21st Mon Sep 15 17:03:54 2003 EDT
Modified files:
/pear/DB_DataObject_FormBuilder FormBuilder.php
Log:
Fixed bug that occured when building selectboxes (if select_order_field was not defined,
and the linked class had its own select_display_field property, FormBuilder was trying
to order by a nonexisting field)
Index: pear/DB_DataObject_FormBuilder/FormBuilder.php
diff -u pear/DB_DataObject_FormBuilder/FormBuilder.php:1.12
pear/DB_DataObject_FormBuilder/FormBuilder.php:1.13
--- pear/DB_DataObject_FormBuilder/FormBuilder.php:1.12 Thu Sep 11 17:47:27 2003
+++ pear/DB_DataObject_FormBuilder/FormBuilder.php Mon Sep 15 17:03:54 2003
@@ -118,7 +118,7 @@
*
* @package DB_DataObject_FormBuilder
* @author Markus Wolff <mw21st@php.net>
- * @version $Id: FormBuilder.php,v 1.12 2003/09/11 21:47:27 mw21st Exp $
+ * @version $Id: FormBuilder.php,v 1.13 2003/09/15 21:03:54 mw21st Exp $
*/
@@ -574,14 +574,7 @@
}
}
if (!isset($opts->select_order_field) || is_null($opts->select_order_field)) {
- if
(isset($_DB_DATAOBJECT_FORMBUILDER['CONFIG']['select_display_field']) &&
-
!empty($_DB_DATAOBJECT_FORMBUILDER['CONFIG']['select_display_field'])
- )
- {
- $order =
$_DB_DATAOBJECT_FORMBUILDER['CONFIG']['select_display_field'];
- } else {
- $order = $displayfield;
- }
+ $order = $displayfield;
} else {
$order = $opts->select_order_field;
}