Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/messages/edit.html.erb

@@ -2,11 +2,13 @@
                :action => 'show', :project_id => @project,
                :id => @board %> &#187; <%= h @message.subject %></h2>
 
-<% form_for :message, @message,
-            :url => {:action => 'edit'},
-            :html => {:multipart => true,
-                      :id => 'message-form',
-                      :method => :post} do |f| %>
+<%= form_for @message, {
+               :as => :message,
+               :url => {:action => 'edit'},
+               :html => {:multipart => true,
+                         :id => 'message-form',
+                         :method => :post}
+          } do |f| %>
   <%= render :partial => 'form',
              :locals => {:f => f, :replying => !@message.parent.nil?} %>
   <%= submit_tag l(:button_save) %>