Merge branch 'release/0.8' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/contact_mailer/from_admin_message.rhtml

1 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 15fb4f5f9..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_url(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_url(request.user))
+                    this_event[:user_url] = user_url(request.user)
                 end
 
                 @event_data.push(this_event)