diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-09 09:33:36 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-09 09:33:36 -0800 |
| commit | c212a34e1d1e2a4bfb546a664958aba168892c49 (patch) | |
| tree | f8d3141efc68192fac8763df8481f706e852d9f9 | |
| parent | 22a6079a20ae13dcb0ad6ddb3ee39a849e5e0928 (diff) | |
| download | rails-c212a34e1d1e2a4bfb546a664958aba168892c49.tar.gz rails-c212a34e1d1e2a4bfb546a664958aba168892c49.tar.bz2 rails-c212a34e1d1e2a4bfb546a664958aba168892c49.zip | |
only load converter if the encodings are different
| -rw-r--r-- | actionpack/test/template/template_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb index fe82504d3b..13d30a93ce 100644 --- a/actionpack/test/template/template_test.rb +++ b/actionpack/test/template/template_test.rb @@ -170,7 +170,7 @@ class TestERBTemplate < ActiveSupport::TestCase def with_external_encoding(encoding) old = Encoding.default_external - Encoding::Converter.new old, encoding + Encoding::Converter.new old, encoding if old != encoding silence_warnings { Encoding.default_external = encoding } yield ensure |