Changeset 390 in subversion

Timestamp:

Dec 1, 2006 1:29:06 PM (6 years ago)

Author:

thomasb

Message:

Applied the latest changes to MDB2 wrapper

File:

• trunk/roundcubemail/program/include/rcube_mdb2.inc (modified) (4 diffs)

trunk/roundcubemail/program/include/rcube_mdb2.inc

@@ -60 +60 @@
    * @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=='')
@@ -67 +67 @@
     $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'];
@@ -94 +95 @@
     {
     // 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))
@@ -286 +287 @@
       return FALSE;
 
-    return $result;
+    return $this->_get_result($result);
     }