diff options
Diffstat (limited to 'phpBB/install/convertors/functions_phpbb20.php')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 62ce8b774a..2f7edc18cd 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -63,8 +63,19 @@ function phpbb_insert_forums() $sql = 'SELECT cat_id, cat_title FROM ' . $convert->src_table_prefix . 'categories ORDER BY cat_order'; + + if ($convert->mysql_convert) + { + $db->sql_query("SET NAMES 'binary'"); + } + $result = $db->sql_query($sql); + if ($convert->mysql_convert) + { + $db->sql_query("SET NAMES 'utf8'"); + } + $cats_added = array(); while ($row = $db->sql_fetchrow($result)) { @@ -151,8 +162,19 @@ function phpbb_insert_forums() LEFT JOIN ' . $convert->src_table_prefix . 'forum_prune fp ON f.forum_id = fp.forum_id GROUP BY f.forum_id ORDER BY f.cat_id, f.forum_order'; + + if ($convert->mysql_convert) + { + $db->sql_query("SET NAMES 'binary'"); + } + $result = $db->sql_query($sql); + if ($convert->mysql_convert) + { + $db->sql_query("SET NAMES 'utf8'"); + } + while ($row = $db->sql_fetchrow($result)) { // Some might have forums here with an id not being "possible"... |