aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-04-15 23:59:56 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-04-15 23:59:56 +0200
commit41db97ad3a1f26e5307d261b5f1318811a4e6637 (patch)
tree6a52455e51802b15f0bd9278f9d91c5786467481
parentd1f96aa03601536c6e191328183ac2dd0068aed7 (diff)
parente9807e17412299d7157d6be82777961a66cada90 (diff)
downloadforums-41db97ad3a1f26e5307d261b5f1318811a4e6637.tar
forums-41db97ad3a1f26e5307d261b5f1318811a4e6637.tar.gz
forums-41db97ad3a1f26e5307d261b5f1318811a4e6637.tar.bz2
forums-41db97ad3a1f26e5307d261b5f1318811a4e6637.tar.xz
forums-41db97ad3a1f26e5307d261b5f1318811a4e6637.zip
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus: [ticket/12397] Fix sql_unique_index_exists doc block
-rw-r--r--phpBB/phpbb/db/tools.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 7616849465..3d480b7e1c 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -892,7 +892,7 @@ class tools
}
}
- // Add unqiue indexes?
+ // Add unique indexes?
if (!empty($schema_changes['add_unique_index']))
{
foreach ($schema_changes['add_unique_index'] as $table => $index_array)
@@ -1303,7 +1303,7 @@ class tools
}
/**
- * Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
+ * Check if a specified index exists in table. Does not return PRIMARY KEY indexes.
*
* @param string $table_name Table to check the index at
* @param string $index_name The index name to check