diff options
| author | José Valim <jose.valim@gmail.com> | 2010-12-09 13:40:45 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-12-09 13:40:45 +0100 |
| commit | 8e6d27641cf213a13d51491cecfbfa1d3c8822fd (patch) | |
| tree | a9c027e17400fb18676c1b5dc3005669d4ec590d /actionpack | |
| parent | cc70ac9508dff6a4406f446d7a53d05f6c7d9f61 (diff) | |
| download | rails-8e6d27641cf213a13d51491cecfbfa1d3c8822fd.tar.gz rails-8e6d27641cf213a13d51491cecfbfa1d3c8822fd.tar.bz2 rails-8e6d27641cf213a13d51491cecfbfa1d3c8822fd.zip | |
Clean up asset_host and asset_path.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index c5a661f2b0..f0c29825ba 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -27,8 +27,8 @@ module ActionController options.page_cache_directory ||= paths["public"].first # make sure readers methods get compiled - options.asset_path ||= nil - options.asset_host ||= nil + options.asset_path ||= app.config.asset_path + options.asset_host ||= app.config.asset_host ActiveSupport.on_load(:action_controller) do include app.routes.mounted_helpers |