Merge branch 'release-0.7' of github.com:roundcube/roundcubemail into release-0.7

1 files changed, 3 insertions, 3 deletions

diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php
index 26e5e974a..9f56118d5 100644
--- a/program/include/rcube_mdb2.php
+++ b/program/include/rcube_mdb2.php
@@ -197,7 +197,7 @@ class rcube_mdb2
      */
     function is_connected()
     {
-        return PEAR::isError($this->db_handle) ? false : $this->db_connected;
+        return is_a($this->db_handle, 'PEAR_Error') ? false : $this->db_connected;
     }
 
 
@@ -285,7 +285,7 @@ class rcube_mdb2
         else {
             $params = (array)$params;
             $q = $this->db_handle->prepare($query, null, $mode=='w' ? MDB2_PREPARE_MANIP : null);
-            if ($this->db_handle->isError($q)) {
+            if (MDB2::isError($q)) {
                 $this->db_error = true;
                 $this->db_error_msg = $q->userinfo;
 
@@ -366,7 +366,7 @@ class rcube_mdb2
 
         $id = $this->db_handle->lastInsertID($table);
 
-        return $this->db_handle->isError($id) ? null : $id;
+        return MDB2::isError($id) ? null : $id;
     }