X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dd7ef37ec023646120358a0a6a7959a392b79f1c..7d45c2fd3c1a968de487de1afab947a06424d22b:/app/controllers/diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 73e9629e0..47c638f3a 100644
--- 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 => STATUS == :database_offline
+  cache_sweeper :diary_sweeper, :only => [:new, :edit, :comment, :hide, :hidecomment]
 
   def new
     @title = t 'diary_entry.new.title'
@@ -60,7 +60,7 @@ class DiaryEntryController < ApplicationController
     @diary_comment.user = @user
     if @diary_comment.save
       if @diary_comment.user != @entry.user
-        Notifier::deliver_diary_comment_notification(@diary_comment)
+        Notifier.diary_comment_notification(@diary_comment).deliver
       end
 
       redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id
@@ -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"] })