- Fix inconsistency when not using default table names (#1486467)

CHANGELOG

@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix inconsistency when not using default table names (#1486467)
 - Fix folder rename/delete buttons do not appear on creation of first folder (#1486468)
 - Fix character set conversion fails on systems where iconv doesn't accept //IGNORE (#1486375)
 - Login preformance: Create default folders on first login only

program/include/main.inc

@@ -69,7 +69,7 @@ function get_table_name($table)
  */
 function get_sequence_name($sequence)
   {
-  // return table name if configured
+  // return sequence name if configured
   $config_key = 'db_sequence_'.$sequence;
   $opt = rcmail::get_instance()->config->get($config_key);
 

program/include/rcube_mdb2.php

@@ -331,9 +331,14 @@ class rcube_mdb2
     if (!$this->db_handle || $this->db_mode=='r')
       return FALSE;
 
+    if ($table) {
+      if ($this->db_provider == 'pgsql')
         // find sequence name
-    if ($table && $this->db_provider == 'pgsql')
         $table = get_sequence_name($table);
+      else
+        // resolve table name
+        $table = get_table_name($table);
+    }
     
     $id = $this->db_handle->lastInsertID($table);