diff options
| -rw-r--r-- | config/environment.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/environment.rb b/config/environment.rb index 84178eab6..27f6972ea 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -7,13 +7,13 @@ # Specifies gem version of Rails to use when vendor/rails is not present RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION +# Bootstrap the Rails environment, frameworks, and default configuration +require File.join(File.dirname(__FILE__), 'boot') + if RUBY_VERSION >= '1.9' && defined?(Rails) && Rails::VERSION::MAJOR < 3 Encoding.default_external = 'UTF-8' end -# Bootstrap the Rails environment, frameworks, and default configuration -require File.join(File.dirname(__FILE__), 'boot') - # Load Engine plugin if available begin require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot') |