diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:17:26 +0000 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:17:26 +0000 |
commit | 589d9b8c1e14bb7086a6b7baf0fa7e3b9aaeabf0 (patch) | |
tree | a6ba229acd978142285b4202d49accec5e15537e /script/handle-mail-replies | |
parent | b9fb32d09b037407e4a39407b35405bc06bc14fc (diff) |
Cater for reliance on vendored Rails as well as un-vendored. Fixes bug introduced in issue #276.
Diffstat (limited to 'script/handle-mail-replies')
-rwxr-xr-x | script/handle-mail-replies | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/script/handle-mail-replies b/script/handle-mail-replies index 62e663372..9451bc9f2 100755 --- a/script/handle-mail-replies +++ b/script/handle-mail-replies @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# -*- coding: utf-8 -*- # Handle email responses sent to us. # @@ -18,7 +19,12 @@ MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) MySociety::Config.load_default require 'rubygems' -require 'action_mailer' +if File.exist? File.join($alaveteli_dir,'vendor','rails','Rakefile') + $:.push(File.join($alaveteli_dir, "vendor", "rails", "actionmailer", "lib", "action_mailer", "vendor", "tmail-1.2.7")) + require 'tmail' +else + require 'action_mailer' +end def main(in_test_mode) Dir.chdir($alaveteli_dir) do |