Imported Upstream version 0.1

[roundcube.git] / program / include / rcube_mdb2.inc

diff --git a/program/include/rcube_mdb2.inc b/program/include/rcube_mdb2.inc
index 02206c62b8a91df50aef17ff9df19a13f15aef45..0b2feffbe1839f1f2fc9824210d55e3eaa750f5b 100644 (file)
--- a/program/include/rcube_mdb2.inc
+++ b/program/include/rcube_mdb2.inc
@@ -16,7 +16,7 @@
  | Author: Lukas Kahwe Smith <smith@pooteeweet.org>                      |
  +-----------------------------------------------------------------------+
 
- $Id: rcube_mdb2.inc 850 2007-10-03 00:13:32Z ihug $
+ $Id: rcube_mdb2.inc 1084 2008-02-14 23:12:23Z till $
 
 */
 
@@ -94,15 +94,17 @@ class rcube_mdb2
   function dsn_connect($dsn)
     {
     // Use persistent connections if available
-    $dbh = MDB2::connect($dsn, array('persistent' => $this->db_pconn, '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))
+    if (MDB2::isError($dbh))
       {
       $this->db_error = TRUE;
       $this->db_error_msg = $dbh->getMessage();
       
-      raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__,
-                        'message' => $dbh->getMessage()), TRUE, FALSE);
+      raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__,
+        'file' => __FILE__, 'message' => $dbh->getUserInfo()), TRUE, FALSE);
       }
     else if ($this->db_provider=='sqlite')
       {