X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b4165975078d6a520f80296fafea19b4c6b83bf5..ee1707a4a743c36855c84dd4231bf77c75a0f59f:/app/views/message/new.rhtml

diff --git a/app/views/message/new.rhtml b/app/views/message/new.rhtml
index 84b3bfdc8..723cb1f10 100644
--- a/app/views/message/new.rhtml
+++ b/app/views/message/new.rhtml
@@ -1,7 +1,7 @@
-<% display_name = User.find_by_id(params[:user_id]).display_name %>
+<% display_name = User.find_by_id(params[:user_id] || @user_id).display_name %>
 <% title = params[:message] ? params[:message][:title] : params[:title] %>
 
-<h2>Send a new message to <%= display_name %></h2>
+<h2>Send a new message to <%= h(display_name) %></h2>
 
 <% if params[:display_name] %>
 <p>Writing a new message to <%= h(params[:display_name]) %></p>  
@@ -10,19 +10,19 @@
 
 <%= error_messages_for 'message' %>
 
-<% form_for :message do |f| %>
+<% form_for :message, :url => {:user_id => params[:user_id] || @user_id,  :action => "new" } do |f| %>
   <table>
     <tr valign="top">
       <th>Subject</th>
-      <td><%= text_field_tag 'message[title]', title, :size => 60 %></td>
+      <td><%= text_field_tag 'message[title]', title, :size => 60, :value => @title %></td>
     </tr>
     <tr valign="top">
       <th>Body</th>
-      <td><%= f.text_area :body, :cols => 80 %></td>
+      <td><%= f.text_area :body, :cols => 80, :value => @body %></td>
     </tr>
     <tr>
       <th></th>
-      <td><%= submit_tag 'Send' %></td>
+      <td><%= submit_tag 'Send', :action => 'new' %></td>
     </tr>
   </table>
 <% end %>