diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-16 13:52:51 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-16 13:55:29 -0700 |
| commit | ade756fe42423033bae8e5aea8f58782f7a6c517 (patch) | |
| tree | 5fecc7c19ef8b6984765928999d8ddbb99771afd /railties/lib/rails | |
| parent | 821e15e5f2d9ef2aa43918a16cbd00f40c221e95 (diff) | |
| download | rails-ade756fe42423033bae8e5aea8f58782f7a6c517.tar.gz rails-ade756fe42423033bae8e5aea8f58782f7a6c517.tar.bz2 rails-ade756fe42423033bae8e5aea8f58782f7a6c517.zip | |
Moved encoding work in progress to a feature branch.
This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 8afe423973..9353fbefef 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -1,5 +1,4 @@ require 'active_support/deprecation' -require 'active_support/core_ext/string/encoding' require 'rails/engine/configuration' module Rails @@ -28,15 +27,8 @@ module Rails def encoding=(value) @encoding = value - if "ruby".encoding_aware? + if defined?(Encoding) && Encoding.respond_to?(:default_external=) Encoding.default_external = value - Encoding.default_internal = value - 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 end end |