From 1897be9b50d92af6d352e1eeb85da2c03713baf3 Mon Sep 17 00:00:00 2001 From: Xu Pan Date: Tue, 20 Dec 2011 12:33:34 +0800 Subject: don't encode an UTF-8 encoded template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- actionpack/lib/action_view/template/error.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_view/template') 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 -- cgit v1.2.3