summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2006-12-01 18:29:06 +0000
committerthomascube <thomas@roundcube.net>2006-12-01 18:29:06 +0000
commitbad419cc4b4e45207b62ecdc33751e6ae1902ccb (patch)
tree58ac1dc196065483b3c2cb0290b6806beca16fa3
parent53ed1e32d88dd80dfc20a900a61316483aace0eb (diff)
Applied the latest changes to MDB2 wrapper
-rwxr-xr-xprogram/include/rcube_mdb2.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/program/include/rcube_mdb2.inc b/program/include/rcube_mdb2.inc
index d37230268..c71e723d0 100755
--- a/program/include/rcube_mdb2.inc
+++ b/program/include/rcube_mdb2.inc
@@ -59,14 +59,15 @@ class rcube_db
* @param string DSN for read/write operations
* @param string Optional DSN for read only operations
*/
- function __construct($db_dsnw, $db_dsnr='')
+ function __construct($db_dsnw, $db_dsnr='', $pconn=false)
{
if ($db_dsnr=='')
$db_dsnr=$db_dsnw;
$this->db_dsnw = $db_dsnw;
$this->db_dsnr = $db_dsnr;
-
+ $this->db_pconn = $pconn;
+
$dsn_array = MDB2::parseDSN($db_dsnw);
$this->db_provider = $dsn_array['phptype'];
}
@@ -93,7 +94,7 @@ class rcube_db
function dsn_connect($dsn)
{
// Use persistent connections if available
- $dbh = MDB2::connect($dsn, array('persistent' => TRUE, 'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL));
+ $dbh = MDB2::connect($dsn, array('persistent' => $this->db_pconn, 'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL));
if (PEAR::isError($dbh))
{
@@ -285,7 +286,7 @@ class rcube_db
if (!$this->db_handle)
return FALSE;
- return $result;
+ return $this->_get_result($result);
}