diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-08 21:44:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-08 21:44:59 +0000 |
| commit | 1aa40171e0677c5307f213f8c58b7156f5885d59 (patch) | |
| tree | cf0721c95893f960cdaef194efef82698a3e824e /phpBB/install | |
| parent | 6a59f3efd68ad9467d053bd151273e898ce65504 (diff) | |
| download | forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar.gz forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar.bz2 forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar.xz forums-1aa40171e0677c5307f213f8c58b7156f5885d59.zip | |
merge...
git-svn-id: file:///svn/phpbb/trunk@8624 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index eb71667435..3b62abacb0 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -31,8 +31,8 @@ unset($dbpasswd); */ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', - 'version' => '1.0.0', - 'phpbb_version' => '3.0.0', + 'version' => '1.0.2', + 'phpbb_version' => '3.0.2', 'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, @@ -191,7 +191,7 @@ if (!$get_info) { $src_db->sql_freeresult($result); } - + /** * Tests for further MODs can be included here. @@ -265,7 +265,7 @@ if (!$get_info) * - empty string == execute nothing * - string == function to execute * - array == complex execution instructions -* +* * Complex execution instructions: * @todo test complex execution instructions - in theory they will work fine * @@ -307,7 +307,7 @@ if (!$get_info) array('target', $convert->truncate_statement . SEARCH_WORDMATCH_TABLE), array('target', $convert->truncate_statement . LOG_TABLE), ), - + // with this you are able to import all attachment files on the fly. For large boards this is not an option, therefore commented out by default. // Instead every file gets copied while processing the corresponding attachment entry. // if (defined("MOD_ATTACHMENT")) { import_attachment_files(); phpbb_copy_thumbnails(); } @@ -489,7 +489,9 @@ if (!$get_info) array('poll_max_options', 1, ''), array('poll_vote_change', 0, ''), - 'left_join' => 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1', + 'left_join' => array ( 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1', + 'topics LEFT JOIN posts ON topics.topic_last_post_id = posts.post_id', + ), 'where' => 'topics.topic_moved_id = 0', ), @@ -685,7 +687,7 @@ if (!$get_info) array('user_id', 'users.user_id', 'phpbb_user_id'), array('folder_name', $user->lang['CONV_SAVED_MESSAGES'], ''), array('pm_count', 0, ''), - + 'where' => 'users.user_id <> -1', ), @@ -709,7 +711,7 @@ if (!$get_info) 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id AND (privmsgs.privmsgs_type = 0 OR privmsgs.privmsgs_type = 1 OR privmsgs.privmsgs_type = 5)', ), - + // Outbox array( 'target' => PRIVMSGS_TO_TABLE, |