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

[rails.git] / app / views / diary_entry / list.html.erb

diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 0767bd402f6a272167707d61b9ce804a4a724e0b..756464aa26ac79116c23219b090b5f2521069da5 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -37,20 +37,20 @@
   <% if @entries.size < @page_size -%>
     <%= t('diary_entry.list.older_entries') %>
   <% else -%>
-    <%= link_to t('diary_entry.list.older_entries'), params.merge(:page => @page + 1 ) %>
+    <%= link_to t('diary_entry.list.older_entries'), @params.merge(:page => @page + 1 ) %>
   <% end -%>
 
   |
 
   <% if @page > 1 -%>
-    <%= link_to t('diary_entry.list.newer_entries'), params.merge(:page => @page - 1) %>
+    <%= link_to t('diary_entry.list.newer_entries'), @params.merge(:page => @page - 1) %>
   <% else -%>
     <%= t('diary_entry.list.newer_entries') %>
   <% end -%>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
-  <% content_for :head do -%>
-  <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
+  <% content_for :auto_discovery_link_tag do -%>
+  <%= auto_discovery_link_tag :rss, :action => 'rss', :language => params[:language] %>
   <% end -%>
 <% end -%>