diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-10-16 12:49:39 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-10-16 12:51:02 -0700 |
| commit | 2110a524a4913815d036786aa01319fd67db0ee2 (patch) | |
| tree | f87858a81ac61642827c0617cad9eeceb44e8707 /railties/lib/rails/core.rb | |
| parent | 6094e6516951444f8c3d6bb31f171af9fe96a02f (diff) | |
| download | rails-2110a524a4913815d036786aa01319fd67db0ee2.tar.gz rails-2110a524a4913815d036786aa01319fd67db0ee2.tar.bz2 rails-2110a524a4913815d036786aa01319fd67db0ee2.zip | |
Deprecate RAILS_ROOT in favor of Rails.root (which proxies to the application's object root)
Diffstat (limited to 'railties/lib/rails/core.rb')
| -rw-r--r-- | railties/lib/rails/core.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb index 929c38bd22..e15661e2d7 100644 --- a/railties/lib/rails/core.rb +++ b/railties/lib/rails/core.rb @@ -6,7 +6,7 @@ module Rails # TODO: w0t? class << self def application - @@application + @@application ||= nil end def application=(application) @@ -43,7 +43,7 @@ module Rails end def root - Pathname.new(RAILS_ROOT) if defined?(RAILS_ROOT) + application && application.config.root end def env |