From 827daf7f0f4b50945dcf4760a4d34137a6040ce3 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Sat, 31 Jan 2015 15:42:39 +0100 Subject: [PATCH] FIX: The order of includes in the base importer was wrong. https://meta.discourse.org/t/importer-for-simple-machines-2-forums/17656/58 --- script/import_scripts/base.rb | 3 +-- script/import_scripts/ning.rb | 1 - script/import_scripts/phpbb3.rb | 6 +----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb index 2b2d249cf49..bad00932983 100644 --- a/script/import_scripts/base.rb +++ b/script/import_scripts/base.rb @@ -11,10 +11,10 @@ if ARGV.include?('bbcode-to-md') require 'ruby-bbcode-to-md' end +require_relative '../../config/environment' require_dependency 'url_helper' require_dependency 'file_helper' - module ImportScripts; end class ImportScripts::Base @@ -22,7 +22,6 @@ class ImportScripts::Base include ActionView::Helpers::NumberHelper def initialize - require_relative '../../config/environment' preload_i18n @bbcode_to_md = true if ARGV.include?('bbcode-to-md') diff --git a/script/import_scripts/ning.rb b/script/import_scripts/ning.rb index 1c6414ff3d5..b9d8ad080a7 100644 --- a/script/import_scripts/ning.rb +++ b/script/import_scripts/ning.rb @@ -1,4 +1,3 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../config/environment") require File.expand_path(File.dirname(__FILE__) + "/base.rb") # Edit the constants and initialize method for your import data. diff --git a/script/import_scripts/phpbb3.rb b/script/import_scripts/phpbb3.rb index c163868f5b2..c5d0019b337 100644 --- a/script/import_scripts/phpbb3.rb +++ b/script/import_scripts/phpbb3.rb @@ -1,8 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../config/environment") require File.expand_path(File.dirname(__FILE__) + "/base.rb") -require_dependency 'url_helper' -require_dependency 'file_helper' - require "mysql2" @@ -313,7 +309,7 @@ class ImportScripts::PhpBB3 < ImportScripts::Base s.gsub!(/\[list=1\](.*?)\[\/list:o\]/m, '[ol]\1[/ol]') # convert *-tags to li-tags so bbcode-to-md can do its magic on phpBB's lists: s.gsub!(/\[\*\](.*?)\[\/\*:m\]/, '[li]\1[/li]') - + s end