From e1c8699be581a72dbe157f6c5d8b4517aec4d7dc Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 19 Mar 2013 10:54:24 +1100 Subject: Stop AlaveteliConfiguration class being loaded twice --- script/handle-mail-replies.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'script/handle-mail-replies.rb') diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index f5d34d796..23430e20a 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -14,12 +14,8 @@ # config file ourselves. $alaveteli_dir = File.expand_path(File.join(File.dirname(__FILE__), '..')) $:.push(File.join($alaveteli_dir, "commonlib", "rblib")) -load "config.rb" $:.push(File.join($alaveteli_dir, "lib")) $:.push(File.join($alaveteli_dir, "lib", "mail_handler")) -require "configuration" -MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) -MySociety::Config.load_default require 'mail_handler' if RUBY_VERSION.to_f >= 1.9 # the default encoding for IO is utf-8, and we use utf-8 internally -- cgit v1.2.3