cvs: pear /DB_DataObject DataObject.php
| From: | Alan Knowles | Date: | Fri, 06 Dec 2002 05:43:50 +0000 |
| Subject: | cvs: pear /DB_DataObject DataObject.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-7754@lists.php.net to get a copy of this message | ||
alan_k Fri Dec 6 00:43:50 2002 EDT
Modified files:
/pear/DB_DataObject DataObject.php
Log:
fix logic on setting dsn
Index: pear/DB_DataObject/DataObject.php
diff -u pear/DB_DataObject/DataObject.php:1.41 pear/DB_DataObject/DataObject.php:1.42
--- pear/DB_DataObject/DataObject.php:1.41 Thu Dec 5 22:32:45 2002
+++ pear/DB_DataObject/DataObject.php Fri Dec 6 00:43:50 2002
@@ -15,7 +15,7 @@
// | Author: Alan Knowles <alan@akbkhome.com>
// +----------------------------------------------------------------------+
//
-// $Id: DataObject.php,v 1.41 2002/12/06 03:32:45 alan_k Exp $
+// $Id: DataObject.php,v 1.42 2002/12/06 05:43:50 alan_k Exp $
//
// Object Based Database Query Builder and data store
//
@@ -967,7 +967,7 @@
if (!$this->_database) {
$this->_database = @$options["table_{$this->__table}"];
}
- if (@$this->_database) {
+ if (@$this->_database &&
@$options["database_{$this->_database}"]) {
$dsn = $options["database_{$this->_database}"];
} else if ($options['database']) {
$dsn = $options['database'];