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

[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 68b4a198505b6204af025356f8a964a538097308..ace586ae54cd25d64e987b1164d03fa7a3defcb5 100644 (file)
--- a/app/views/changeset/list.atom.builder
+++ b/app/views/changeset/list.atom.builder
@@ -1,8 +1,8 @@
 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.icon image_url("favicon.ico")
 
   feed.updated @edits.map { |e| [e.created_at, e.closed_at].max }.max
   feed.icon image_url("favicon.ico")