aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/tools
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-06-17 09:03:38 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-06-17 09:03:38 +0200
commit6007978e7bbda3a3c5cc2b2b4f10ba80ce885c03 (patch)
tree5407cd3273bf6faebd95beb84bd103a91387be15 /phpBB/phpbb/db/tools
parentbd646cff525418f1f19c15ddbc38cc49188583a2 (diff)
parentde308ea321ed43ee5f82a73e95321f755acf36d8 (diff)
downloadforums-6007978e7bbda3a3c5cc2b2b4f10ba80ce885c03.tar
forums-6007978e7bbda3a3c5cc2b2b4f10ba80ce885c03.tar.gz
forums-6007978e7bbda3a3c5cc2b2b4f10ba80ce885c03.tar.bz2
forums-6007978e7bbda3a3c5cc2b2b4f10ba80ce885c03.tar.xz
forums-6007978e7bbda3a3c5cc2b2b4f10ba80ce885c03.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/phpbb/db/tools')
-rw-r--r--phpBB/phpbb/db/tools/tools.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/tools/tools.php b/phpBB/phpbb/db/tools/tools.php
index ccba63a5d3..d128df96c4 100644
--- a/phpBB/phpbb/db/tools/tools.php
+++ b/phpBB/phpbb/db/tools/tools.php
@@ -576,7 +576,7 @@ class tools implements tools_interface
{
foreach ($indexes as $index_name)
{
- if (!$this->sql_index_exists($table, $index_name))
+ if (!$this->sql_index_exists($table, $index_name) && !$this->sql_unique_index_exists($table, $index_name))
{
continue;
}