cvs: pear /Translation2/Container mdb.php mdb2.php
| From: | Lorenzo Alberton | Date: | Sun, 04 Jul 2004 21:01:58 +0000 |
| Subject: | cvs: pear /Translation2/Container mdb.php mdb2.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-21507@lists.php.net to get a copy of this message | ||
quipo Sun Jul 4 17:01:58 2004 EDT
Modified files:
/pear/Translation2/Container mdb.php mdb2.php
Log:
do a better job, when checking for an existing connection...
http://cvs.php.net/diff.php/pear/Translation2/Container/mdb.php?r1=1.8&r2=1.9&ty=u
Index: pear/Translation2/Container/mdb.php
diff -u pear/Translation2/Container/mdb.php:1.8 pear/Translation2/Container/mdb.php:1.9
--- pear/Translation2/Container/mdb.php:1.8 Mon Apr 19 10:58:47 2004
+++ pear/Translation2/Container/mdb.php Sun Jul 4 17:01:57 2004
@@ -16,11 +16,11 @@
// | Author: Lorenzo Alberton <l dot alberton at quipo dot it> |
// +----------------------------------------------------------------------+
//
-// $Id: mdb.php,v 1.8 2004/04/19 14:58:47 quipo Exp $
+// $Id: mdb.php,v 1.9 2004/07/04 21:01:57 quipo Exp $
//
/**
* @package Translation2
- * @version $Id: mdb.php,v 1.8 2004/04/19 14:58:47 quipo Exp $
+ * @version $Id: mdb.php,v 1.9 2004/07/04 21:01:57 quipo Exp $
*/
/**
@@ -36,7 +36,7 @@
* by the PEAR MDB abstraction layer to fetch data.
*
* @package Translation2
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
class Translation2_Container_mdb extends Translation2_Container
{
@@ -119,6 +119,9 @@
*/
function _prepare()
{
+ if (is_a($this->db, 'MDB_Common')) {
+ return true;
+ }
return $this->_connect($this->options['dsn']);
}
http://cvs.php.net/diff.php/pear/Translation2/Container/mdb2.php?r1=1.6&r2=1.7&ty=u
Index: pear/Translation2/Container/mdb2.php
diff -u pear/Translation2/Container/mdb2.php:1.6 pear/Translation2/Container/mdb2.php:1.7
--- pear/Translation2/Container/mdb2.php:1.6 Sun Jun 20 09:57:03 2004
+++ pear/Translation2/Container/mdb2.php Sun Jul 4 17:01:57 2004
@@ -16,11 +16,11 @@
// | Author: Lorenzo Alberton <l dot alberton at quipo dot it> |
// +----------------------------------------------------------------------+
//
-// $Id: mdb2.php,v 1.6 2004/06/20 13:57:03 quipo Exp $
+// $Id: mdb2.php,v 1.7 2004/07/04 21:01:57 quipo Exp $
//
/**
* @package Translation2
- * @version $Id: mdb2.php,v 1.6 2004/06/20 13:57:03 quipo Exp $
+ * @version $Id: mdb2.php,v 1.7 2004/07/04 21:01:57 quipo Exp $
*/
/**
@@ -36,7 +36,7 @@
* by the PEAR MDB2 abstraction layer to fetch data.
*
* @package Translation2
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
class Translation2_Container_mdb2 extends Translation2_Container
{
@@ -118,6 +118,9 @@
*/
function _prepare()
{
+ if (is_a($this->db, 'MDB2_Driver_Common')) {
+ return true;
+ }
return $this->_connect($this->options['dsn']);
}