From dab78e55cfcc111b898a1c2475c0c5c327db30f9 Mon Sep 17 00:00:00 2001 From: Tekin Suleyman Date: Tue, 25 Nov 2008 11:27:32 +0000 Subject: Ensure ActionMailer doesn't blow up when a two argument proc is set for the asset host Signed-off-by: Michael Koziarski [#1394 state:committed] --- actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_view/helpers/asset_tag_helper.rb') diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 4ec7a383e5..0633d5414e 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -574,7 +574,7 @@ module ActionView private def request - @controller.request + request? && @controller.request end def request? -- cgit v1.2.3