Merge remote-tracking branch 'openaustralia_github/make-links-relative' into develop

Conflicts:
    app/controllers/admin_request_controller.rb
    app/models/request_mailer.rb
    app/views/admin_general/index.rhtml
    app/views/admin_general/stats.rhtml
    app/views/admin_public_body/_one_list.rhtml
    app/views/admin_public_body/_tags.rhtml
    app/views/admin_public_body/show.rhtml
    app/views/admin_request/show.rhtml
    app/views/admin_user/show.rhtml
    app/views/layouts/admin.rhtml
    app/views/public_body/show.rhtml
    app/views/request/new.rhtml

1 files changed, 2 insertions, 2 deletions

diff --git a/app/views/api/request_events.atom.builder b/app/views/api/request_events.atom.builder
index 44759ae7e..648a81e5c 100644
--- a/app/views/api/request_events.atom.builder
+++ b/app/views/api/request_events.atom.builder
@@ -8,7 +8,7 @@ atom_feed("xmlns:alaveteli" => "http://www.alaveteli.org/API/v2/RequestEvents/At
             
             entry.updated(event.created_at.utc.iso8601)
             entry.tag!("alaveteli:event_type", event.event_type)
-            entry.tag!("alaveteli:request_url", main_url(request_url(request)))
+            entry.tag!("alaveteli:request_url", request_url(request))
             entry.title(request.title)
             
             entry.content(event.outgoing_message.body, :type => 'text')
@@ -16,7 +16,7 @@ atom_feed("xmlns:alaveteli" => "http://www.alaveteli.org/API/v2/RequestEvents/At
             entry.author do |author|
                 author.name(request.user_name)
                 if !request.user.nil?
-                    author.uri(main_url(user_url(request.user)))
+                    author.uri(user_url(request.user))
                 end
                 author.email(request.incoming_email)
             end