diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-05-01 15:41:34 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-05-01 15:41:34 -0500 |
| commit | 8e8a8b55b98747d586300031cdfc22efb459bba5 (patch) | |
| tree | 789d3b04931dbc6e0651cb764a9cf9bc02f3329a /railties/lib/initializer.rb | |
| parent | ab4d455d6d149fba9243444f4c7c7f78ecb78a96 (diff) | |
| parent | c699a4daf1d496fe6d902c845a4d4c108dda3a6b (diff) | |
| download | rails-8e8a8b55b98747d586300031cdfc22efb459bba5.tar.gz rails-8e8a8b55b98747d586300031cdfc22efb459bba5.tar.bz2 rails-8e8a8b55b98747d586300031cdfc22efb459bba5.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/initializer.rb')
| -rw-r--r-- | railties/lib/initializer.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index ea61d4e4fe..09a98d5aa3 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -28,7 +28,11 @@ module Rails end def root - RAILS_ROOT + if defined?(RAILS_ROOT) + RAILS_ROOT + else + nil + end end def env @@ -40,7 +44,7 @@ module Rails end def public_path - @@public_path ||= File.join(self.root, "public") + @@public_path ||= self.root ? File.join(self.root, "public") : "public" end def public_path=(path) |