Merge branch 'release/0.11' into wdtk

1 files changed, 4 insertions, 9 deletions

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 5d8ceb888..49b226e4b 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -83,7 +83,7 @@ class ApiController < ApplicationController
 
         direction = json["direction"]
         body = json["body"]
-        sent_at_str = json["sent_at"]
+        sent_at = json["sent_at"]
 
         errors = []
 
@@ -107,12 +107,6 @@ class ApiController < ApplicationController
             errors << "The 'body' is empty"
         end
 
-        begin
-            sent_at = Time.iso8601(sent_at_str)
-        rescue ArgumentError
-            errors << "Failed to parse 'sent_at' field as ISO8601 time: #{sent_at_str}"
-        end
-
         if direction == "request" && !attachments.nil?
             errors << "You cannot attach files to messages in the 'request' direction"
         end
@@ -155,7 +149,8 @@ class ApiController < ApplicationController
                 )
             end
 
-            mail = RequestMailer.create_external_response(request, body, sent_at, attachment_hashes)
+            mail = RequestMailer.external_response(request, body, sent_at, attachment_hashes)
+
             request.receive(mail, mail.encoded, true)
         end
         render :json => {
@@ -248,6 +243,6 @@ class ApiController < ApplicationController
 
     private
     def make_url(*args)
-        "http://" + Configuration::domain + "/" + args.join("/")
+        "http://" + AlaveteliConfiguration::domain + "/" + args.join("/")
     end
 end