diff options
| author | Xu Pan <cqpanxu@gmail.com> | 2011-12-20 12:33:34 +0800 |
|---|---|---|
| committer | Xu Pan <cqpanxu@gmail.com> | 2011-12-20 12:38:25 +0800 |
| commit | 10304a228d2b31a52c3e2e0efd83190f4d1d5e28 (patch) | |
| tree | 251c546fd5fd09f508483f9e4c4372e432379dc8 | |
| parent | 9d6e52b55ec67d0573a0bb1900b13f38e18f7eba (diff) | |
| download | rails-10304a228d2b31a52c3e2e0efd83190f4d1d5e28.tar.gz rails-10304a228d2b31a52c3e2e0efd83190f4d1d5e28.tar.bz2 rails-10304a228d2b31a52c3e2e0efd83190f4d1d5e28.zip | |
don't encode an UTF-8 encoded template
| -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 |