Update to rails 3

[rails.git] / app / controllers / diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 320f3d029de3e7416de519f99150dc2a97e95445..13a8818fb063552a51e6ad13ff589d5aa8bd5859 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -10,7 +10,7 @@ class DiaryEntryController < ApplicationController
 
   caches_action :list, :view, :layout => false
   caches_action :rss, :layout => true
-  cache_sweeper :diary_sweeper, :only => [:new, :edit, :comment, :hide, :hidecomment], :unless => OSM_STATUS == :database_offline
+  cache_sweeper :diary_sweeper, :only => [:new, :edit, :comment, :hide, :hidecomment]
 
   def new
     @title = t 'diary_entry.new.title'
@@ -111,8 +111,6 @@ class DiaryEntryController < ApplicationController
   end
 
   def rss
-    request.format = :rss
-
     if params[:display_name]
       user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })