diff options
| author | Tekin Suleyman <tekin@tekin.co.uk> | 2008-11-25 11:27:32 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-12-01 19:38:25 +0100 |
| commit | dab78e55cfcc111b898a1c2475c0c5c327db30f9 (patch) | |
| tree | 5dba08dcfbc50339ed513e17bfffe2553b63c443 /actionpack | |
| parent | bda55f82c687920807f606a2b024f1882094ef1e (diff) | |
| download | rails-dab78e55cfcc111b898a1c2475c0c5c327db30f9.tar.gz rails-dab78e55cfcc111b898a1c2475c0c5c327db30f9.tar.bz2 rails-dab78e55cfcc111b898a1c2475c0c5c327db30f9.zip | |
Ensure ActionMailer doesn't blow up when a two argument proc is set for the asset host
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1394 state:committed]
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 |
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 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? |