diff options
| author | Sergey Nartimov <just.lest@gmail.com> | 2011-12-24 15:57:54 +0300 |
|---|---|---|
| committer | Sergey Nartimov <just.lest@gmail.com> | 2011-12-24 15:57:54 +0300 |
| commit | 5ca86ac8f924b333a5a01a47cc07cbcf39c16e80 (patch) | |
| tree | da7a9a4d9cd8ad05648bde5d283715d5feea4d81 /railties/lib | |
| parent | a5fa310f406e299a1ac54d1a227bde93b7ce282b (diff) | |
| download | rails-5ca86ac8f924b333a5a01a47cc07cbcf39c16e80.tar.gz rails-5ca86ac8f924b333a5a01a47cc07cbcf39c16e80.tar.bz2 rails-5ca86ac8f924b333a5a01a47cc07cbcf39c16e80.zip | |
deprecate String#encoding_aware? and remove its usage
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index d14cf737d9..79b12ad4eb 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -65,17 +65,9 @@ module Rails def encoding=(value) @encoding = value - if "ruby".encoding_aware? - silence_warnings do - Encoding.default_external = value - Encoding.default_internal = value - end - else - $KCODE = value - if $KCODE == "NONE" - raise "The value you specified for config.encoding is " \ - "invalid. The possible values are UTF8, SJIS, or EUC" - end + silence_warnings do + Encoding.default_external = value + Encoding.default_internal = value end end |