diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-01-24 10:29:38 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-01-24 10:29:38 -0600 |
| commit | 92126521551a7c62e9032eda4a2b8a6d92c0279f (patch) | |
| tree | 45b5cf6d261fd3eeaab9f9512946b3f12fb8221d /railties/lib/rails/application.rb | |
| parent | 6545a68264682e8d0a0ee0e913fa98d92fef9428 (diff) | |
| download | rails-92126521551a7c62e9032eda4a2b8a6d92c0279f.tar.gz rails-92126521551a7c62e9032eda4a2b8a6d92c0279f.tar.bz2 rails-92126521551a7c62e9032eda4a2b8a6d92c0279f.zip | |
Add Rails::Application pointer to the default app to add symmetry to Foo::Application
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index e14719c758..ab66d1e90b 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -16,7 +16,11 @@ module Rails alias :configure :class_eval def instance - @instance ||= new + if instance_of?(Rails::Application) + Rails.application.instance + else + @instance ||= new + end end def inherited(base) |