From 5569afc48b692e2459fe0fa7e3859aa9a6dfffc0 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Fri, 19 Aug 2016 21:35:32 +0200 Subject: [PATCH] phpBB3 importer: Don't ignore users that belong to non-existent group --- script/import_scripts/phpbb3/database/database_3_0.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb index c596b37338a..a54e0540a0b 100644 --- a/script/import_scripts/phpbb3/database/database_3_0.rb +++ b/script/import_scripts/phpbb3/database/database_3_0.rb @@ -7,7 +7,6 @@ module ImportScripts::PhpBB3 count(<<-SQL) SELECT COUNT(*) AS count FROM #{@table_prefix}users u - JOIN #{@table_prefix}groups g ON g.group_id = u.group_id WHERE u.user_type != #{Constants::USER_TYPE_IGNORE} SQL end @@ -18,7 +17,7 @@ module ImportScripts::PhpBB3 u.user_type, u.user_inactive_reason, g.group_name, b.ban_start, b.ban_end, b.ban_reason, u.user_posts, u.user_website, u.user_from, u.user_birthday, u.user_avatar_type, u.user_avatar FROM #{@table_prefix}users u - JOIN #{@table_prefix}groups g ON (g.group_id = u.group_id) + LEFT OUTER JOIN #{@table_prefix}groups g ON (g.group_id = u.group_id) LEFT OUTER JOIN #{@table_prefix}banlist b ON ( u.user_id = b.ban_userid AND b.ban_exclude = 0 AND (b.ban_end = 0 OR b.ban_end >= UNIX_TIMESTAMP())