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

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

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index e4d6c70d9afb5809ef87fbf0d92588bfc465fc53..658c43483b2b872d80b1393a2bfb54b7c205cdb7 100644 (file)
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -117,7 +117,7 @@ class MessagesController < ApplicationController
 
   # Set the message as being read or unread.
   def mark
 
   # Set the message as being read or unread.
   def mark

-    @message = current_user.messages.find(params[:message_id])
+    @message = current_user.messages.unscope(:where => :muted).find(params[:message_id])

     if params[:mark] == "unread"
       message_read = false
       notice = t ".as_unread"
     if params[:mark] == "unread"
       message_read = false
       notice = t ".as_unread"


@@ -128,7 +128,11 @@ class MessagesController < ApplicationController
     @message.message_read = message_read
     if @message.save
       flash[:notice] = notice
     @message.message_read = message_read
     if @message.save
       flash[:notice] = notice

-      redirect_to inbox_messages_path, :status => :see_other
+      if @message.muted?
+        redirect_to muted_messages_path, :status => :see_other
+      else
+        redirect_to inbox_messages_path, :status => :see_other
+      end

     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"
     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"