Merge pull request #3279 from gschlager/importers_01

Fix gem load order for all importers

script/import_scripts/discuz_x.rb

@@ -7,9 +7,8 @@
 # This script is tested only on Simplified Chinese Discuz! X instances
 # If you want to import data other than Simplified Chinese, email me.
 
-require File.expand_path(File.dirname(__FILE__) + "/base.rb")
-
 require 'mysql2'
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
 class ImportScripts::DiscuzX < ImportScripts::Base
 

script/import_scripts/drupal.rb

@@ -1,6 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + "/base.rb")
-
 require "mysql2"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
 class ImportScripts::Drupal < ImportScripts::Base
 

script/import_scripts/drupal_qa.rb

@@ -1,8 +1,7 @@
+require "mysql2"
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require File.expand_path(File.dirname(__FILE__) + "/drupal.rb")
 
-require "mysql2"
-
 class ImportScripts::DrupalQA < ImportScripts::Drupal
 
   def categories_query

script/import_scripts/kunena.rb

@@ -1,6 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + "/base.rb")
-
 require "mysql2"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
 class ImportScripts::Kunena < ImportScripts::Base
 

script/import_scripts/phpbb3.rb

@@ -1,6 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require "mysql2"
-
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
 class ImportScripts::PhpBB3 < ImportScripts::Base
 

script/import_scripts/vanilla.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require "csv"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
 class ImportScripts::Vanilla < ImportScripts::Base
 

script/import_scripts/vbulletin.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require 'mysql2'
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require 'htmlentities'
 
 class ImportScripts::VBulletin < ImportScripts::Base

script/import_scripts/vbulletin_old.rb

@@ -1,6 +1,6 @@
+require "csv"
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require "optparse"
-require "csv"
 
 class ImportScripts::VBulletinOld < ImportScripts::Base