diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-20 01:58:01 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-20 01:58:01 -0800 |
commit | fde9af06785cb871ad040a34b04380b28d9657c7 (patch) | |
tree | e1ca6142f8ce8549d513a0fcd088c1ebf0394eac /actionpack/lib | |
parent | 23f6cabff1c6af1815a02f0dfd15f0316cd7f4d6 (diff) | |
parent | 10304a228d2b31a52c3e2e0efd83190f4d1d5e28 (diff) | |
download | rails-fde9af06785cb871ad040a34b04380b28d9657c7.tar.gz rails-fde9af06785cb871ad040a34b04380b28d9657c7.tar.bz2 rails-fde9af06785cb871ad040a34b04380b28d9657c7.zip |
Merge pull request #4043 from cqpx/master
don't encode an UTF-8 encoded template
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_view/template/error.rb | 2 |
1 files changed, 1 insertions, 1 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 |