Merge pull request #4595 from AntonKhorev/simplify-links-on-trace-pages

[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 b17192ec81a1943da715d773817daa1d97ab1335..924ffb9357257631c1213ea138691c9e7a57b7be 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 => :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.link show_trace_url(trace.user, trace)
+        xml.guid show_trace_url(trace.user, trace)

 
         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