Changeset 504 in subversion

Timestamp:

Mar 13, 2007 6:53:26 PM (6 years ago)

Author:

thomasb

Message:

Fixed bugs in rcube_db and rcube_imap classes

Location:

trunk/roundcubemail/program/include

Files:

• rcube_db.inc (modified) (3 diffs)
• rcube_imap.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_db.inc

@@ -294 +294 @@
       case 'pgsql':
         $result = &$this->db_handle->getOne("SELECT CURRVAL('$sequence')");
-        
-      case 'mssql':
-        $result = &$this->db_handle->getOne("SELECT @@IDENTITY");
-
         if (DB::isError($result))
           raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, 
                             'message' => $result->getMessage()), TRUE, FALSE);
-
+        return $result;
+
+      case 'mssql':
+        $result = &$this->db_handle->getOne("SELECT @@IDENTITY");
+        if (DB::isError($result))
+          raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, 
+                            'message' => $result->getMessage()), TRUE, FALSE);
         return $result;
                 
@@ -309 +311 @@
       case 'mysqli':
         return mysqli_insert_id($this->db_handle->connection);
-        
+
       case 'sqlite':
         return sqlite_last_insert_rowid($this->db_handle->connection);
@@ -359 +361 @@
   function _fetch_row($result, $mode)
     {
-    if (DB::isError($result))
+    if (!$result || DB::isError($result))
       {
       raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__,

trunk/roundcubemail/program/include/rcube_imap.inc

@@ -879 +879 @@
       $results = array();
       foreach ($criteria as $crit)
-        $results = array_merge($results, $this->search($mbox_name, $crit, $str, $charset));
+        if ($search_result = $this->search($mbox_name, $crit, $str, $charset))
+          $results = array_merge($results, $search_result);
       
       $results = array_unique($results);