1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2019-10-13 12:32:20 +02:00
26 changed files with 25 additions and 1034 deletions

View File

@@ -1754,21 +1754,6 @@ function phpbb_create_userconv_table()
switch ($db->get_sql_layer())
{
case 'mysql':
$map_dbms = 'mysql_40';
break;
case 'mysql4':
if (version_compare($db->sql_server_info(true), '4.1.3', '>='))
{
$map_dbms = 'mysql_41';
}
else
{
$map_dbms = 'mysql_40';
}
break;
case 'mysqli':
$map_dbms = 'mysql_41';
break;
@@ -1794,13 +1779,6 @@ function phpbb_create_userconv_table()
)';
break;
case 'mysql_40':
$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
user_id mediumint(8) NOT NULL,
username_clean blob NOT NULL
)';
break;
case 'mysql_41':
$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
user_id mediumint(8) NOT NULL,