From 55b5e714113e346e5e37f147c65a3b811d6bcfdf Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 8 Jan 2007 16:47:16 +0000 Subject: - ok... first of all, let the forum names and descriptions being recoded correctly... - fixed the php notices for a non-existant poster id. They were related to user signature conversion - adjusted the topic_poster id; this should solve wrong user assignments for topic poster - adjusted private message author; normally here some users should have encountered wrong ids. - adjusted the batch sizes to support the usual 2.0.x target base - the old values were used for really huge conversions. :) - commented out meta refresh for the time being - we will add a setting for this, some may want to sit in front, some may want to go away while converting (most likely when they did a test run before) git-svn-id: file:///svn/phpbb/trunk@6860 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/convertors/functions_phpbb20.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'phpBB/install/convertors/functions_phpbb20.php') 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"... -- cgit v1.2.1