aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/api_controller.rb
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-02-15 13:11:46 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-02-15 14:47:02 +1100
commit4c9f7f7f12a47b516137bf000c3f36120033a077 (patch)
tree7c482e526733ea0c913a6e783bcf3f719e4fbac7 /app/controllers/api_controller.rb
parent114d00d1c1e2a997d1921ae044ed7d51237b6434 (diff)
Stop using main_url to generate absolute urls for the main site
Diffstat (limited to 'app/controllers/api_controller.rb')
-rw-r--r--app/controllers/api_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index aa1ea632f..5d8ceb888 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -220,7 +220,7 @@ class ApiController < ApplicationController
:event_id => event.id,
:created_at => event.created_at.iso8601,
:event_type => event.event_type,
- :request_url => main_url(request_path(request)),
+ :request_url => request_url(request),
:request_email => request.incoming_email,
:title => request.title,
:body => event.outgoing_message.body,
@@ -228,7 +228,7 @@ class ApiController < ApplicationController
:user_name => request.user_name,
}
if request.user
- this_event[:user_url] = main_url(user_path(request.user))
+ this_event[:user_url] = user_url(request.user)
end
@event_data.push(this_event)