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

diff --git a/config/environment.rb b/config/environment.rb
index 16d46a9ab16e0827b3aaa57003821ab0e158fc59..7d9c1dd9f60bf7460584d7a835d370c9cfbae7a9 100644 (file)
--- 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