Merge branch 'master' into moderation

[rails.git] / app / views / changeset / list.atom.builder

diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder
index 979a7492f08efcc1cf4f82cb4690c167dc5d6446..ace586ae54cd25d64e987b1164d03fa7a3defcb5 100644 (file)
--- a/app/views/changeset/list.atom.builder
+++ b/app/views/changeset/list.atom.builder
@@ -1,16 +1,16 @@
 atom_feed(:language => I18n.locale, :schema_date => 2009,
 atom_feed(:language => I18n.locale, :schema_date => 2009,

-          :id => url_for(params.merge(:only_path => false)),
-          :root_url => url_for(params.merge(:action => :list, :format => nil, :only_path => false)),
+          :id => url_for(@params.merge(:only_path => false)),
+          :root_url => url_for(@params.merge(:action => :list, :format => nil, :only_path => false)),

           "xmlns:georss" => "http://www.georss.org/georss") do |feed|
           "xmlns:georss" => "http://www.georss.org/georss") do |feed|

-  feed.title changeset_list_title(params, @user)
+  feed.title changeset_list_title(params, current_user)

 
   feed.updated @edits.map { |e| [e.created_at, e.closed_at].max }.max
 
   feed.updated @edits.map { |e| [e.created_at, e.closed_at].max }.max

-  feed.icon "http://#{SERVER_URL}/favicon.ico"
-  feed.logo "http://#{SERVER_URL}/images/mag_map-rss2.0.png"
+  feed.icon image_url("favicon.ico")
+  feed.logo image_url("mag_map-rss2.0.png")

 
   feed.rights :type => "xhtml" do |xhtml|
     xhtml.a :href => "http://creativecommons.org/licenses/by-sa/2.0/" do |a|
 
   feed.rights :type => "xhtml" do |xhtml|
     xhtml.a :href => "http://creativecommons.org/licenses/by-sa/2.0/" do |a|

-      a.img :src => "http://#{SERVER_URL}/images/cc_button.png", :alt => "CC by-sa 2.0"
+      a.img :src => image_url("cc_button.png"), :alt => "CC by-sa 2.0"

     end
   end
 
     end
   end