codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 10:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: The order of includes in the base importer was wrong.

Browse source 
https://meta.discourse.org/t/importer-for-simple-machines-2-forums/17656/58
This commit is contained in:
Gerhard Schlager 2015-01-31 15:42:39 +01:00
parent 3948ea89eb
commit 827daf7f0f
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
script/import_scripts/base.rb
View file

@ -11,10 +11,10 @@ if ARGV.include?('bbcode-to-md')
require 'ruby-bbcode-to-md' require 'ruby-bbcode-to-md'
end end
require_relative '../../config/environment'
require_dependency 'url_helper' require_dependency 'url_helper'
require_dependency 'file_helper' require_dependency 'file_helper'
module ImportScripts; end module ImportScripts; end
class ImportScripts::Base class ImportScripts::Base
@ -22,7 +22,6 @@ class ImportScripts::Base
include ActionView::Helpers::NumberHelper include ActionView::Helpers::NumberHelper
def initialize def initialize
require_relative '../../config/environment'
preload_i18n preload_i18n
@bbcode_to_md = true if ARGV.include?('bbcode-to-md') @bbcode_to_md = true if ARGV.include?('bbcode-to-md')

1
script/import_scripts/ning.rb
View file

@ -1,4 +1,3 @@
require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
require File.expand_path(File.dirname(__FILE__) + "/base.rb") require File.expand_path(File.dirname(__FILE__) + "/base.rb")
# Edit the constants and initialize method for your import data. # Edit the constants and initialize method for your import data.

6
script/import_scripts/phpbb3.rb
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 File.expand_path(File.dirname(__FILE__) + "/base.rb")
require_dependency 'url_helper'
require_dependency 'file_helper'
require "mysql2" require "mysql2"
@ -313,7 +309,7 @@ class ImportScripts::PhpBB3 < ImportScripts::Base
s.gsub!(/\[list=1\](.*?)\[\/list:o\]/m, '[ol]\1[/ol]') 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: # convert *-tags to li-tags so bbcode-to-md can do its magic on phpBB's lists:
s.gsub!(/\[\*\](.*?)\[\/\*:m\]/, '[li]\1[/li]') s.gsub!(/\[\*\](.*?)\[\/\*:m\]/, '[li]\1[/li]')
s s
end end