diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-01-28 04:57:54 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-01-28 04:57:54 +0000 |
| commit | 84e2822e27469c110821801f9dc2b81413392c5d (patch) | |
| tree | ab469bd1dd9371447cab84bd991e819e2ccb02d3 /config/environment.rb | |
| parent | adf77fa6c2316d5989365957c76530cdb1674885 (diff) | |
| download | redmine-84e2822e27469c110821801f9dc2b81413392c5d.tar.gz redmine-84e2822e27469c110821801f9dc2b81413392c5d.zip | |
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
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |