X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ff03138a978406b431da71aba64941d87b509098..64fb530581ffd21e2522e70e8a2d4c46d666f760:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 2e5e09b45..e1062bc9f 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -12,7 +12,6 @@ class MessageController < ApplicationController
   # clicks send.
   # The display_name param is the display name of the user that the message is being sent to.
   def new
-    @title = t 'message.new.title'
     @to_user = User.find_by_display_name(params[:display_name])
     if @to_user
       if params[:message]
@@ -27,7 +26,14 @@ class MessageController < ApplicationController
           redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
         end
       else
-        @title = params[:title]
+        if params[:title]
+          # ?title= is set when someone reponds to this user's diary
+          # entry. Then we pre-fill out the subject and the <title>
+          @title = @subject = params[:title]
+        else
+          # The default /message/new/$user view
+          @title = t 'message.new.title'
+        end
       end
     else
       @title = t'message.no_such_user.title'
@@ -39,7 +45,7 @@ class MessageController < ApplicationController
   def reply
     message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
     @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
-    @title = "Re: #{message.title.sub(/^Re:\s*/, '')}"
+    @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}"
     @to_user = User.find(message.from_user_id)
     render :action => 'new'
   rescue ActiveRecord::RecordNotFound
@@ -99,3 +105,4 @@ class MessageController < ApplicationController
     render :action => 'no_such_user', :status => :not_found
   end
 end
+