Merge remote-tracking branch 'upstream/pull/4581'

[rails.git] / app / views / traces / georss.rss.builder

diff --git a/app/views/traces/georss.rss.builder b/app/views/traces/georss.rss.builder
index c2f569ae9b3edb53c946056ff56690194ed8d126..36641fec0b4e2f14c8f7191f0be3f084655840de 100644 (file)
--- a/app/views/traces/georss.rss.builder
+++ b/app/views/traces/georss.rss.builder
@@ -21,8 +21,8 @@ xml.rss("version" => "2.0",
       xml.item do
         xml.title trace.name
 
       xml.item do
         xml.title trace.name
 

-        xml.link url_for(:controller => :traces, :action => :view, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
-        xml.guid url_for(:controller => :traces, :action => :view, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
+        xml.link url_for(:controller => :traces, :action => :show, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
+        xml.guid url_for(:controller => :traces, :action => :show, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)

 
         xml.description do
           xml.cdata! render(:partial => "description", :object => trace, :formats => [:html])
 
         xml.description do
           xml.cdata! render(:partial => "description", :object => trace, :formats => [:html])


@@ -30,7 +30,7 @@ xml.rss("version" => "2.0",
 
         xml.dc :creator, trace.user.display_name
 
 
         xml.dc :creator, trace.user.display_name
 

-        xml.pubDate trace.timestamp.to_s(:rfc822)
+        xml.pubDate trace.timestamp.to_fs(:rfc822)

 
         if trace.latitude && trace.longitude
           xml.geo :lat, trace.latitude
 
         if trace.latitude && trace.longitude
           xml.geo :lat, trace.latitude