X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/98d935f663d64e5babbdc73fb37d85e59ba38128..7eb181999d3357bf210ceb24e18c913bf3ef6ba3:/app/controllers/message_controller.rb diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 8aecef98e..395d56028 100644 --- 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