From e8b2579865e90068658182074d2ea73bafbda3d2 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 14 Dec 2011 13:28:39 -0500
Subject: [PATCH] - Aplied fixes from trunk up to r5615
---
CHANGELOG | 2 ++
installer/rcube_install.php | 14 +++++++++++---
SQL/sqlite.update.sql | 2 +-
SQL/sqlite.initial.sql | 2 +-
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index c872df3..ca22592 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 8c8da5c..2c4f9dc 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -147,7 +147,7 @@
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 92f6da1..c722a84 100644
--- a/SQL/sqlite.update.sql
+++ b/SQL/sqlite.update.sql
@@ -246,7 +246,7 @@
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 dbe662a..737972b 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -504,17 +504,25 @@
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
*/
--
Gitblit v1.9.1