Changeset 3246 in subversion

Timestamp:

Feb 3, 2010 6:16:18 AM (3 years ago)

Author:

alec

Message:

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

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)
• program/include/rcube_mdb2.php (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

trunk/roundcubemail/program/include/main.inc

@@ -70 +70 @@
 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);

trunk/roundcubemail/program/include/rcube_mdb2.php

@@ -332 +332 @@
       return FALSE;
 
-    // find sequence name
-    if ($table && $this->db_provider == 'pgsql')
-      $table = get_sequence_name($table);
-
+    if ($table) {
+      if ($this->db_provider == 'pgsql')
+        // find sequence name
+        $table = get_sequence_name($table);
+      else
+        // resolve table name
+        $table = get_table_name($table);
+    }
+    
     $id = $this->db_handle->lastInsertID($table);