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

[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 d3d7f6a7cee9d7fbbe4836d4fd3e17d05813c108..70cb1654da8c9d0f7adf5b56197d482d81d54626 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -66,7 +66,7 @@ class DiaryEntryController < ApplicationController
 
       # Notify current subscribers of the new comment
       @entry.subscribers.visible.each do |user|
-        Notifier.diary_comment_notification(@diary_comment, user).deliver_now if current_user != user
+        Notifier.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user
       end
 
       # Add the commenter to the subscribers if necessary
@@ -225,8 +225,8 @@ class DiaryEntryController < ApplicationController
   # a helpful error message and return them to the user page.
   def deny_access(exception)
     if current_user && exception.action.in?([:hide, :hidecomment])
-      flash[:error] = t("user.filter.not_an_administrator")
-      redirect_to :action => "view"
+      flash[:error] = t("users.filter.not_an_administrator")
+      redirect_to :action => "show"
     else
       super
     end