aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-03-04 01:01:21 -0800
committerCarl Lerche <carllerche@mac.com>2010-03-04 01:01:21 -0800
commitad2e6ee4ec5cc6c6bc5f11bfb875e582dbe55468 (patch)
tree5833055757c2a6bd882ea827a10bb6a39ab801ae /actionpack/lib
parent9eddc8544417323dcd8460026027c3359b2ad717 (diff)
downloadrails-ad2e6ee4ec5cc6c6bc5f11bfb875e582dbe55468.tar.gz
rails-ad2e6ee4ec5cc6c6bc5f11bfb875e582dbe55468.tar.bz2
rails-ad2e6ee4ec5cc6c6bc5f11bfb875e582dbe55468.zip
Fix a bunch of failing AP / AM specs created from the previous AbstractController configuration refactor.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index b52d255d1f..de3d61ebbe 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -670,7 +670,7 @@ module ActionView
# or the value returned from invoking the proc if it's a proc or the value from
# invoking call if it's an object responding to call.
def compute_asset_host(source)
- if host = ActionController::Base.asset_host
+ if host = config.asset_host
if host.is_a?(Proc) || host.respond_to?(:call)
case host.is_a?(Proc) ? host.arity : host.method(:call).arity
when 2