From 84e2822e27469c110821801f9dc2b81413392c5d Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 28 Jan 2012 04:57:54 +0000
Subject: 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
---
 config/environment.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/environment.rb')

diff --git a/config/environment.rb b/config/environment.rb
index 16d46a9ab..7d9c1dd9f 100644
--- 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
 
-- 
cgit v1.2.3