##// END OF EJS Templates
Ruby1.9: move setting Encoding.default_external after boot (#4050, #4796)...
Toshi MARUYAMA -
r8713:a2c362a88dde
parent child
Show More
@@ -7,13 +7,13
7 # Specifies gem version of Rails to use when vendor/rails is not present
7 # Specifies gem version of Rails to use when vendor/rails is not present
8 RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
8 RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
9
9
10 # Bootstrap the Rails environment, frameworks, and default configuration
11 require File.join(File.dirname(__FILE__), 'boot')
12
10 if RUBY_VERSION >= '1.9' && defined?(Rails) && Rails::VERSION::MAJOR < 3
13 if RUBY_VERSION >= '1.9' && defined?(Rails) && Rails::VERSION::MAJOR < 3
11 Encoding.default_external = 'UTF-8'
14 Encoding.default_external = 'UTF-8'
12 end
15 end
13
16
14 # Bootstrap the Rails environment, frameworks, and default configuration
15 require File.join(File.dirname(__FILE__), 'boot')
16
17 # Load Engine plugin if available
17 # Load Engine plugin if available
18 begin
18 begin
19 require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
19 require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
General Comments 0
You need to be logged in to leave comments. Login now