Ruby1.9: set Encoding.default_external on only Rails2 (#4050, #4796)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8713 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-28 04:57:54 +00:00 · 2012-01-28 04:57:54 +00:00 · 84e2822e27
parent adf77fa6c2
commit 84e2822e27
1 changed files with 1 additions and 1 deletions
--- a/config/environment.rb
+++ b/config/environment.rb
@ -7,7 +7,7 @@
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION

-if RUBY_VERSION >= '1.9'
+if RUBY_VERSION >= '1.9' && defined?(Rails) && Rails::VERSION::MAJOR < 3
  Encoding.default_external = 'UTF-8'
 end