split_node_tags: Merge changes from main branch.

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 8aecef98e56a87059595550c72064170fca66501..395d56028999d92a99a70e4b20d020942aa0d1d9 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -34,10 +34,8 @@ class MessageController < ApplicationController
 
   def reply
     message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
-    @body = "\n\nOn #{message.sent_on} #{message.sender.display_name} wrote:\n #{message.body}" 
-    @title = "Re: #{message.title}"
-    @user_id = message.from_user_id
-    render :action => 'new'
+    title = message.title.sub(/^Re:\s*/, "Re: ")
+    redirect_to :action => 'new', :user_id => message.from_user_id, :title => title
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => :not_found
   end