mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 09:36:19 -05:00
FIX: The order of includes in the base importer was wrong.
https://meta.discourse.org/t/importer-for-simple-machines-2-forums/17656/58
This commit is contained in:
parent
3948ea89eb
commit
827daf7f0f
3 changed files with 2 additions and 8 deletions
|
@ -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')
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue