diff options
author | Xu Pan <cqpanxu@gmail.com> | 2011-12-20 12:33:34 +0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-20 11:56:33 +0100 |
commit | 1897be9b50d92af6d352e1eeb85da2c03713baf3 (patch) | |
tree | 59a8eea3a2282e2c44ba1e069c5326a32d9639b3 | |
parent | 5d913640bcb16c9b086a291c59483d308a62adff (diff) | |
download | rails-1897be9b50d92af6d352e1eeb85da2c03713baf3.tar.gz rails-1897be9b50d92af6d352e1eeb85da2c03713baf3.tar.bz2 rails-1897be9b50d92af6d352e1eeb85da2c03713baf3.zip |
don't encode an UTF-8 encoded template
Signed-off-by: José Valim <jose.valim@gmail.com>
-rw-r--r-- | actionpack/lib/action_view/template/error.rb | 2 | ||||
-rw-r--r-- | railties/test/application/middleware/exceptions_test.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb index fe27e54037..ee74bb47d3 100644 --- a/actionpack/lib/action_view/template/error.rb +++ b/actionpack/lib/action_view/template/error.rb @@ -94,7 +94,7 @@ module ActionView "#{indent}#{line_counter}: #{line}\n" end - extract.encode! if extract.respond_to?(:encode!) + extract.force_encoding("UTF-8") if extract.respond_to?(:encode!) extract end diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb index a9cde42be8..aedc4fe648 100644 --- a/railties/test/application/middleware/exceptions_test.rb +++ b/railties/test/application/middleware/exceptions_test.rb @@ -99,7 +99,7 @@ module ApplicationTests app_file 'app/views/foo/index.html.erb', <<-ERB <% raise 'boooom' %> - ✓ + ✓測試テスト시험 ERB app_file 'config/routes.rb', <<-RUBY @@ -110,6 +110,7 @@ module ApplicationTests post '/foo', :utf8 => '✓' assert_match(/boooom/, last_response.body) + assert_match(/測試テスト시험/, last_response.body) end end end |