mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- ok... first of all, let the forum names and descriptions being recoded correctly...

Browse Source 
- 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
This commit is contained in:
Meik Sievertsen
2007-01-08 16:47:16 +00:00
parent b94a240d2f
commit 55b5e71411
4 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/install/convertors/convert_phpbb20.php
View File

@@ -517,7 +517,7 @@ if (!$get_info)
array('poll_option_id', 'vote_results.vote_option_id', ''),
array('topic_id', 'vote_desc.topic_id', ''),
array('', 'topics.topic_poster AS poster_id', ''),
array('', 'topics.topic_poster AS poster_id', 'phpbb_user_id'),
array('poll_option_text', 'vote_results.vote_option_text', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
array('poll_option_total', 'vote_results.vote_result', ''),
@@ -605,7 +605,7 @@ if (!$get_info)
array('msg_id', 'privmsgs.privmsgs_id', ''),
array('root_level', 0, ''),
array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'),
array('author_id', 'privmsgs.privmsgs_from_userid AS poster_id', 'phpbb_user_id'),
array('icon_id', 0, ''),
array('author_ip', 'privmsgs.privmsgs_ip', 'decode_ip'),
array('message_time', 'privmsgs.privmsgs_date', ''),
@@ -624,7 +624,6 @@ if (!$get_info)
array('bbcode_uid', 'privmsgs.privmsgs_date AS post_time', 'make_uid'),
array('message_text', 'privmsgs_text.privmsgs_text', 'phpbb_prepare_message'),
array('', 'privmsgs_text.privmsgs_bbcode_uid AS old_bbcode_uid', ''),
array('', 'privmsgs.privmsgs_from_userid AS poster_id', ''),
array('bbcode_bitfield', '', 'get_bbcode_bitfield'),
array('to_address', 'privmsgs.privmsgs_to_userid', 'phpbb_privmsgs_to_userid'),
@@ -787,6 +786,7 @@ if (!$get_info)
),
array('user_id', 'users.user_id', 'phpbb_user_id'),
array('', 'users.user_id AS poster_id', 'phpbb_user_id'),
array('user_type', 'users.user_active', 'set_user_type'),
array('group_id', 'users.user_level', 'phpbb_set_primary_group'),
array('user_regdate', 'users.user_regdate', ''),

22
phpBB/install/convertors/functions_phpbb20.php
View File

@@ -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"...