cvs: pear /DB_DataObject_FormBuilder FormBuilder.php
| From: | Justin Patrin | Date: | Tue, 29 Mar 2005 00:43:05 +0000 |
| Subject: | cvs: pear /DB_DataObject_FormBuilder FormBuilder.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-30753@lists.php.net to get a copy of this message | ||
justinpatrin Mon Mar 28 19:43:05 2005 EDT
Modified files:
/pear/DB_DataObject_FormBuilder FormBuilder.php
Log:
Fetch loop should not run if find() fails
http://cvs.php.net/diff.php/pear/DB_DataObject_FormBuilder/FormBuilder.php?r1=1.142&r2=1.143&ty=u
Index: pear/DB_DataObject_FormBuilder/FormBuilder.php
diff -u pear/DB_DataObject_FormBuilder/FormBuilder.php:1.142
pear/DB_DataObject_FormBuilder/FormBuilder.php:1.143
--- pear/DB_DataObject_FormBuilder/FormBuilder.php:1.142 Mon Mar 28 19:39:00 2005
+++ pear/DB_DataObject_FormBuilder/FormBuilder.php Mon Mar 28 19:43:05 2005
@@ -97,7 +97,7 @@
*
* @package DB_DataObject_FormBuilder
* @author Markus Wolff <mw21st@php.net>
- * @version $Id: FormBuilder.php,v 1.142 2005/03/29 00:39:00 justinpatrin Exp $
+ * @version $Id: FormBuilder.php,v 1.143 2005/03/29 00:43:05 justinpatrin Exp $
*/
// Import requirements
@@ -2351,14 +2351,14 @@
$this->_do->prepareLinkedDataObject($do,
'__tripleLink_'.$tripleLink['table']);
}
}
- $do->find();
-
- $oldFieldValues = array();
- while ($do->fetch()) {
- if (isset($rows[$do->$toField1]) && in_array($do->$toField2,
$rows[$do->$toField1])) {
- $oldFieldValues[$do->$toField1][$do->$toField2] = true;
- } else {
- $do->delete();
+ if ($do->find()) {
+ $oldFieldValues = array();
+ while ($do->fetch()) {
+ if (isset($rows[$do->$toField1]) &&
in_array($do->$toField2, $rows[$do->$toField1])) {
+ $oldFieldValues[$do->$toField1][$do->$toField2] = true;
+ } else {
+ $do->delete();
+ }
}
}
@@ -2410,14 +2410,14 @@
$this->_do->prepareLinkedDataObject($do,
'__crossLink_'.$crossLink['table']);
}
}
- $do->find();
-
- $oldFieldValues = array();
- while ($do->fetch()) {
- if (isset($fieldvalues[$do->$toField])) {
- $oldFieldValues[$do->$toField] = clone($do);
- } else {
- $do->delete();
+ if ($do->find()) {
+ $oldFieldValues = array();
+ while ($do->fetch()) {
+ if (isset($fieldvalues[$do->$toField])) {
+ $oldFieldValues[$do->$toField] = clone($do);
+ } else {
+ $do->delete();
+ }
}
}
if (count($fieldvalues) > 0) {