merge 19601:19888 of rails_port into the openID branch

[rails.git] / app / views / user_blocks / edit.html.erb

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 66123e717959d2f64434e295c042f69b5ea78d0a..387335d9d07e4b6e20248e38228bee58c5078bb6 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -8,8 +8,8 @@
   <%= f.error_messages %>
 
   <p>
-    <%= f.label :reason, t('user_block.edit.reason', :name => @user_block.user.display_name) %><br />
-    <%= f.text_area :reason %>
+    <%= f.label :reason, t('user_block.edit.reason', :name => h(@user_block.user.display_name)) %><br />
+    <%= f.text_area :reason, :cols => 80, :rows => 5 %>
   </p>
   <p>
     <%= label_tag 'user_block_period', t('user_block.edit.period') %><br />