aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop/create_schema_files.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/develop/create_schema_files.php')
-rw-r--r--phpBB/develop/create_schema_files.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 52e1af0e3a..487bd792d0 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -379,9 +379,16 @@ foreach ($supported_dbms as $dbms)
}
$line .= 'NOT NULL';
- if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+ if (isset($column_data[2]))
{
- $line .= ' auto_increment';
+ if ($column_data[2] == 'auto_increment')
+ {
+ $line .= ' auto_increment';
+ }
+ else if ($dbms === 'mysql_41' && $column_data[2] == 'true_sort')
+ {
+ $line .= ' COLLATE utf8_general_ci';
+ }
}
$line .= ",\n";
@@ -1744,7 +1751,7 @@ function get_schema_struct()
'topic_attachment' => array('BOOL', 0),
'topic_approved' => array('BOOL', 1),
'topic_reported' => array('BOOL', 0),
- 'topic_title' => array('XSTEXT_UNI', ''),
+ 'topic_title' => array('XSTEXT_UNI', '', 'true_sort'),
'topic_poster' => array('UINT', 0),
'topic_time' => array('TIMESTAMP', 0),
'topic_time_limit' => array('TIMESTAMP', 0),