diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-04-13 17:33:27 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-04-13 17:33:27 -0500 |
| commit | 420c4b3d8878156d04f45e47050ddc62ae00c68c (patch) | |
| tree | e56d27d2078a7553b161a1088594e147e25ed2da /actionpack/lib/action_controller/dispatcher.rb | |
| parent | be7fd8168aa4776dccfe2e670cb9451204449dd4 (diff) | |
| download | rails-420c4b3d8878156d04f45e47050ddc62ae00c68c.tar.gz rails-420c4b3d8878156d04f45e47050ddc62ae00c68c.tar.bz2 rails-420c4b3d8878156d04f45e47050ddc62ae00c68c.zip | |
Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 [nicksieger]
Diffstat (limited to 'actionpack/lib/action_controller/dispatcher.rb')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index 92576bdb2b..30db7d9f73 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -67,7 +67,7 @@ module ActionController end cattr_accessor :error_file_path - self.error_file_path = "#{::RAILS_ROOT}/public" if defined? ::RAILS_ROOT + self.error_file_path = Rails.public_path if defined?(Rails.public_path) cattr_accessor :unprepared self.unprepared = true |