diff options
| author | wycats <wycats@gmail.com> | 2010-04-26 23:32:30 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-26 23:32:30 -0700 |
| commit | 91963e9e33eb5a28297323f1346aeb8b643e9d65 (patch) | |
| tree | 0452dbaf63110fb5a19c958da50d4677dee11333 /railties/lib/rails/engine.rb | |
| parent | d5d717161d853d8d7240da59b41a879bdac6e982 (diff) | |
| parent | c1d73270717f30498f8f4d55d6695509107c2834 (diff) | |
| download | rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.tar.gz rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.tar.bz2 rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/engine.rb')
| -rw-r--r-- | railties/lib/rails/engine.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 98da7e2b4a..36fcc896ae 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -1,6 +1,7 @@ require 'rails/railtie' require 'active_support/core_ext/module/delegation' require 'pathname' +require 'rbconfig' module Rails # Rails::Engine allows you to wrap a specific Rails application and share it accross @@ -119,7 +120,7 @@ module Rails root = File.exist?("#{root_path}/#{flag}") ? root_path : default raise "Could not find root path for #{self}" unless root - RUBY_PLATFORM =~ /mswin|mingw/ ? + Config::CONFIG['host_os'] =~ /mswin|mingw/ ? Pathname.new(root).expand_path : Pathname.new(root).realpath end end |