Merge pull request #3153 from gschlager/import_scripts

FIX: The order of includes in the base importer was wrong.
This commit is contained in:
Régis Hanol 2015-01-31 17:44:45 +01:00
commit c502e9fc47
3 changed files with 2 additions and 8 deletions

View File

@ -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')

View File

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

View File

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