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

[rails.git] / app / views / changeset / history.html.erb

diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb
index 7f08a40b3ff5ddc5dda534c1d6b82cbecb38f5a9..ba745cb032489d833ddcf36b997fb6b3c0a49b0f 100644 (file)
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@ -1,13 +1,13 @@
 <% content_for :auto_discovery_link_tag do -%>
   <% unless params[:friends] or params[:nearby] -%>
-    <%= auto_discovery_link_tag :atom, params.merge(:max_id => nil, :xhr => nil, :action => :feed) %>
+    <%= auto_discovery_link_tag :atom, @params.merge(:max_id => nil, :xhr => nil, :action => :feed) %>
   <% end -%>
 <% end -%>
 
 <%
-   set_title(changeset_list_title(params, @user))
+   set_title(changeset_index_title(params, current_user))
    if params[:display_name]
-     @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe
+     @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
    else
      @heading = @title
    end