- Aplied fixes from trunk up to r5615

4 files changed, 15 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c872df378..ca225929e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix broken CREATE INDEX queries in SQLite DDL files (#1488255)
+
 RELEASE 0.7
 -----------
 - Make Roundcube render the Email Standards Project Acid Test correctly
diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index 8c8da5c0f..2c4f9dccc 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -147,7 +147,7 @@ CREATE TABLE searches (
   data text NOT NULL
 );
 
-CREATE UNIQUE INDEX ix_searches_user_type_name (user_id, type, name);
+CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
 
 -- --------------------------------------------------------
 
diff --git a/SQL/sqlite.update.sql b/SQL/sqlite.update.sql
index 92f6da142..c722a84f8 100644
--- a/SQL/sqlite.update.sql
+++ b/SQL/sqlite.update.sql
@@ -246,7 +246,7 @@ CREATE TABLE searches (
   data text NOT NULL
 );
 
-CREATE UNIQUE INDEX ix_searches_user_type_name (user_id, type, name);
+CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
 
 DROP TABLE messages;
 
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index dbe662acf..737972b93 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -504,17 +504,25 @@ class rcube_install
     
     return $out;
   }
-  
+
   /**
    * Create a HTML dropdown to select a previous version of Roundcube
    */
   function versions_select($attrib = array())
   {
     $select = new html_select($attrib);
-    $select->add(array('0.1-stable', '0.1.1', '0.2-alpha', '0.2-beta', '0.2-stable', '0.3-stable', '0.3.1', '0.4-beta', '0.4.2', '0.5-beta', '0.5', '0.5.1'));
+    $select->add(array(
+        '0.1-stable', '0.1.1',
+        '0.2-alpha', '0.2-beta', '0.2-stable',
+        '0.3-stable', '0.3.1',
+        '0.4-beta', '0.4.2',
+        '0.5-beta', '0.5', '0.5.1',
+        '0.6-beta', '0.6',
+        '0.7-beta', '0.7',
+    ));
     return $select;
   }
-  
+
   /**
    * Return a list with available subfolders of the skin directory
    */