aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/db_tools.php
diff options
context:
space:
mode:
authorShibu Lijack <shibulijack@gmail.com>2012-04-10 21:46:14 +0530
committerShibu Lijack <shibulijack@gmail.com>2012-04-10 21:46:14 +0530
commitfd55c8664a046258c12e8a207d44340010155627 (patch)
tree1a520b8965b88f39cee72e5ce8bb093fb9c38d35 /phpBB/includes/db/db_tools.php
parentdaee25340381d4b97119be298a9fc2671e681bb3 (diff)
parent41e03164c19751624968435f31f1b63367cd4eb2 (diff)
downloadforums-fd55c8664a046258c12e8a207d44340010155627.tar
forums-fd55c8664a046258c12e8a207d44340010155627.tar.gz
forums-fd55c8664a046258c12e8a207d44340010155627.tar.bz2
forums-fd55c8664a046258c12e8a207d44340010155627.tar.xz
forums-fd55c8664a046258c12e8a207d44340010155627.zip
Merge remote-tracking branch 'upstream/develop' into ticket/10734
Conflicts: phpBB/styles/prosilver/theme/tweaks.css
Diffstat (limited to 'phpBB/includes/db/db_tools.php')
-rw-r--r--phpBB/includes/db/db_tools.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index f9f4c97309..efb8b3ebd7 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -2114,7 +2114,7 @@ class phpbb_db_tools
case 'mysql_40':
case 'mysql_41':
- $statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX (' . implode(', ', $column) . ')';
+ $statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
break;
case 'mssql':