Merge pull request #3816 from lest/exception-page-utf-8

fix exception page when template contains utf-8 and parameters contain utf-8

1 files changed, 5 insertions, 1 deletions

diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index 587e37a84f..fe27e54037 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -89,10 +89,14 @@ module ActionView
         line_counter = start_on_line
         return unless source_code = source_code[start_on_line..end_on_line]
 
-        source_code.sum do |line|
+        extract = source_code.sum do |line|
           line_counter += 1
           "#{indent}#{line_counter}: #{line}\n"
         end
+
+        extract.encode! if extract.respond_to?(:encode!)
+
+        extract
       end
 
       def sub_template_of(template_path)