Merged r9711 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9724 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 4abb1a357168b7edccfa241e5ea7d57d77512f04..dc847de5058cce561ba8c98d4203fa2a80695e83 100644 (file)
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -43,7 +43,7 @@ module ActionView
   end
 end
 
-ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
+ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| html_tag || ''.html_safe }
 
 require 'mail'
 

diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index 7cd823e6f1f0b4645f7052248909d2a433466331..5ffc31f8a3bf93c1320e5ac164b8fb3e9e283bb6 100644 (file)
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_test.rb
@@ -149,6 +149,7 @@ class QueriesControllerTest < ActionController::TestCase
     end
     assert_response :success
     assert_template 'new'
+    assert_select 'input[name=?]', 'query[name]'
   end
 
   def test_edit_global_public_query