From: Tom Hughes <tom@compton.nu>
Date: Fri, 16 Nov 2012 17:03:48 +0000 (+0000)
Subject: Always use the canonical host name in diary RSS feeds
X-Git-Tag: live~5188
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1c5db113e215892ecff6090c571ffa1c4b9737db?hp=44528ffe0fd830e17440ab02a620cce99ea8271c;ds=sidebyside

Always use the canonical host name in diary RSS feeds
---

diff --git a/app/views/diary_entry/rss.rss.builder b/app/views/diary_entry/rss.rss.builder
index 7ee36e9bd..35f05028d 100644
--- a/app/views/diary_entry/rss.rss.builder
+++ b/app/views/diary_entry/rss.rss.builder
@@ -6,24 +6,24 @@ xml.rss("version" => "2.0",
   xml.channel do
     xml.title @title
     xml.description @description
-    xml.link url_for(:action => "list", :only_path => false)
+    xml.link url_for(:action => "list", :host => SERVER_URL)
     xml.image do
       xml.url "http://www.openstreetmap.org/images/mag_map-rss2.0.png"
       xml.title "OpenStreetMap"
       xml.width "100"
       xml.height "100"
-      xml.link url_for(:action => "list", :only_path => false)
+      xml.link url_for(:action => "list", :host=> SERVER_URL)
     end
 
     for entry in @entries
       xml.item do
         xml.title h(entry.title)
-        xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
-        xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
+        xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
+        xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
         xml.description entry.body.to_html
         xml.author entry.user.display_name
         xml.pubDate entry.created_at.to_s(:rfc822)
-        xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :only_path => false)
+        xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :host => SERVER_URL)
         
         if entry.latitude and entry.longitude
           xml.geo :lat, entry.latitude.to_s