Correct merge issues in the last merge from master

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index b5b3e45a75ecc98923167b649ca4d3116b2ac398..5db9cccfa052a0b623120133d1003e100377343e 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -115,6 +115,7 @@ class MessageController < ApplicationController
       if message.save
         if request.xhr?
           render :update do |page|
       if message.save
         if request.xhr?
           render :update do |page|

+            page.replace "inboxanchor", :partial => "layouts/inbox"

             page.replace "inbox-count", :partial => "message_count"
             page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message
           end
             page.replace "inbox-count", :partial => "message_count"
             page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message
           end