Merge branch 'feature/public-body-api' into develop

2 files changed, 3 insertions, 3 deletions

diff --git a/script/handle-mail-replies b/script/handle-mail-replies
index ad4b3719e..15454b311 100755
--- a/script/handle-mail-replies
+++ b/script/handle-mail-replies
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cd "`dirname "$0"`"
-exec bundle exec ./handle-mail-replies.rb
+exec bundle exec ./handle-mail-replies.rb "$@"
diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb
index cc15fe35a..05a934c76 100755
--- a/script/handle-mail-replies.rb
+++ b/script/handle-mail-replies.rb
@@ -166,8 +166,8 @@ def forward_on(raw_message)
 end
 
 def load_rails
-    require File.join('config', 'boot')
-    require Rails.root + '/config/environment'
+    require File.join($alaveteli_dir, 'config', 'boot')
+    require File.join(Rails.root, "config", "environment")
 end
 
 def record_bounce(email_address, bounce_message)