0
@@ -8,6 +8,7 @@ class Feeds < Application
0
     xml.instruct!
0
     case params[:format]
0
     when "rss"
0
+      content_type :rss
0
       xml.rss "version" => "2.0" do
0
         xml.channel do
0
           xml.title         Configuration.current.title
0
@@ -27,6 +28,7 @@ class Feeds < Application
0
         end
0
       end
0
     when "atom"
0
+      content_type :atom
0
       xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
0
         xml.title           Configuration.current.title
0
         xml.subtitle        Configuration.current.tag_line

0
@@ -20,4 +20,7 @@ end
0
 Hooks::View.register_partial_view "head", "feed_link"
0
 Hooks::View.register_partial_view "sidebar", "feed_link"
0
 
0
-Hooks::Menu.add_menu_item "Feed Settings", "/admin/feed_settings"
0
\ No newline at end of file
0
+Hooks::Menu.add_menu_item "Feed Settings", "/admin/feed_settings"
0
+
0
+Merb.add_mime_type(:atom, nil, %w[application/atom+xml], :charset => "utf-8")
0
+Merb.add_mime_type(:rss,  nil, %w[application/rss+xml],  :charset => "utf-8")