From 853e2ee5356017d06eb860d80c6f2d90b5411f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 2 Jan 2015 13:06:57 +0100
Subject: [PATCH] FIX: rss link in category pages

---
 app/views/layouts/_head.html.erb       | 17 ++++++++---------
 app/views/layouts/application.html.erb |  4 ++--
 app/views/list/list.erb                |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 334aff879..367f11086 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,14 +1,13 @@
-
 <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <meta name="author" content="">
-    <meta name="generator" content="Discourse <%= Discourse::VERSION::STRING %> - https://github.com/discourse/discourse version <%= Discourse.git_version %>">
+<meta name="author" content="">
+<meta name="generator" content="Discourse <%= Discourse::VERSION::STRING %> - https://github.com/discourse/discourse version <%= Discourse.git_version %>">
 
-    <link rel="icon" type="image/png" href="<%=SiteSetting.favicon_url%>">
-    <link rel="apple-touch-icon" type="image/png" href="<%=SiteSetting.apple_touch_icon_url%>">
+<link rel="icon" type="image/png" href="<%=SiteSetting.favicon_url%>">
+<link rel="apple-touch-icon" type="image/png" href="<%=SiteSetting.apple_touch_icon_url%>">
 
-    <%= canonical_link_tag %>
+<%= canonical_link_tag %>
 
-    <%= render partial: "common/special_font_face" %>
-    <%= render partial: "common/discourse_stylesheet" %>
+<%= render partial: "common/special_font_face" %>
+<%= render partial: "common/discourse_stylesheet" %>
 
-    <%= discourse_csrf_tags %>
+<%= discourse_csrf_tags %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 111e92e81..cc71444dd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -7,11 +7,11 @@
     <%= render partial: "layouts/head" %>
 
     <%- if SiteSetting.enable_escaped_fragments? %>
-    <meta name="fragment" content="!">
+      <meta name="fragment" content="!">
     <%- end %>
 
     <%- if shared_session_key %>
-    <meta name="shared_session_key" content="<%= shared_session_key %>">
+      <meta name="shared_session_key" content="<%= shared_session_key %>">
     <%- end %>
 
     <%= script "preload_store" %>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 4091f0b01..669b8f9eb 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -20,13 +20,13 @@
 
 <% if @rss %>
   <% content_for :head do %>
-    <%= auto_discovery_link_tag(:rss, {action: "#{@rss}_feed"}, title: I18n.t("rss_description.#{@rss}")) %>
+    <%= auto_discovery_link_tag(:rss, { action: "#{@rss}_feed" }, title: I18n.t("rss_description.#{@rss}")) %>
   <% end %>
 <% end %>
 
 <% if @category %>
   <% content_for :head do %>
-    <%= auto_discovery_link_tag(@category, {action: :category_feed, format: :rss}, title: t('rss_topics_in_category', category: @category.name), type: 'application/rss+xml') %>
+    <%= auto_discovery_link_tag(:rss, { action: :category_feed }, title: t('rss_topics_in_category', category: @category.name)) %>
   <% end %>
 <% end %>