aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-11-05 19:03:24 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-11-05 19:03:24 +0000
commit811d6ef6d10a64059a14c629c24701ab1b18ff97 (patch)
treeca27b9808898c7073c4fef7f144eb105ea679e66 /phpBB
parent830276508b3cd8c658dfe67f00138de0194c5cae (diff)
downloadforums-811d6ef6d10a64059a14c629c24701ab1b18ff97.tar
forums-811d6ef6d10a64059a14c629c24701ab1b18ff97.tar.gz
forums-811d6ef6d10a64059a14c629c24701ab1b18ff97.tar.bz2
forums-811d6ef6d10a64059a14c629c24701ab1b18ff97.tar.xz
forums-811d6ef6d10a64059a14c629c24701ab1b18ff97.zip
#5122
git-svn-id: file:///svn/phpbb/trunk@6556 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_database.php15
1 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 4034b36526..cbd654fbcc 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -1382,9 +1382,16 @@ class acp_database
{
$kname = $row['Key_name'];
- if ($kname != 'PRIMARY' && $row['Non_unique'] == 0)
+ if ($kname != 'PRIMARY')
{
- $kname = "UNIQUE|$kname";
+ if ($row['Index_type'] == 'FULLTEXT')
+ {
+ $kname = "FULLTEXT|$kname";
+ }
+ else if ($row['Non_unique'] == 0)
+ {
+ $kname = "UNIQUE|$kname";
+ }
}
if ($row['Sub_part'])
@@ -1407,6 +1414,10 @@ class acp_database
{
$line .= 'UNIQUE ' . substr($key, 7) . ' (' . implode(', ', $columns) . ')';
}
+ else if (strpos($key, 'FULLTEXT') === 0)
+ {
+ $line .= 'FULLTEXT ' . substr($key, 9) . ' (' . implode(', ', $columns) . ')';
+ }
else
{
$line .= "KEY $key (" . implode(', ', $columns) . ')';