diff --git a/script/import_scripts/bbpress.rb b/script/import_scripts/bbpress.rb index 6d27e950eaa..9059270f6f4 100644 --- a/script/import_scripts/bbpress.rb +++ b/script/import_scripts/bbpress.rb @@ -47,9 +47,9 @@ class ImportScripts::Bbpress < ImportScripts::Base last_user_id = -1 total_users = bbpress_query(<<-SQL SELECT COUNT(DISTINCT(u.id)) AS cnt - FROM #{BB_PRESS_PREFIX}users u - LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id - WHERE p.post_type IN ('forum', 'reply', 'topic') + FROM #{BB_PRESS_PREFIX}users u + LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id + WHERE p.post_type IN ('forum', 'reply', 'topic') AND user_email LIKE '%@%' SQL ).first["cnt"] @@ -58,7 +58,7 @@ class ImportScripts::Bbpress < ImportScripts::Base users = bbpress_query(<<-SQL SELECT u.id, user_nicename, display_name, user_email, user_registered, user_url, user_pass FROM #{BB_PRESS_PREFIX}users u - LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id + LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id WHERE user_email LIKE '%@%' AND p.post_type IN ('forum', 'reply', 'topic') AND u.id > #{last_user_id} @@ -305,7 +305,7 @@ class ImportScripts::Bbpress < ImportScripts::Base topics.each do |t| topic = topic_lookup_from_imported_post_id(t['id']) - Permalink.create( url: URI.parse(t['guid']).path.chomp('/'), topic_id: topic[:topic_id] ) rescue nil + Permalink.create(url: URI.parse(t['guid']).path.chomp('/'), topic_id: topic[:topic_id]) rescue nil end last_topic_id = topics[-1]["id"].to_i end diff --git a/script/import_scripts/phpbb3/support/text_processor.rb b/script/import_scripts/phpbb3/support/text_processor.rb index 561b2c2f69b..d89a6cc99fb 100644 --- a/script/import_scripts/phpbb3/support/text_processor.rb +++ b/script/import_scripts/phpbb3/support/text_processor.rb @@ -49,7 +49,7 @@ module ImportScripts::PhpBB3 # [url=https://google.com:1qh1i7ky]click here[/url:1qh1i7ky] # [quote="cybereality":b0wtlzex]Some text.[/quote:b0wtlzex] text.gsub!(/:(?:\w{8})\]/, ']') - + # remove color tags text.gsub!(/\[\/?color(=#[a-z0-9]*)?\]/i, "") end @@ -148,7 +148,7 @@ module ImportScripts::PhpBB3 end def process_code(text) - text.gsub!(//, "\n") text