diff options
| author | Sean Walbran <swalbran@socialcast.com> | 2013-05-15 09:07:46 -0500 |
|---|---|---|
| committer | Sean Walbran <swalbran@socialcast.com> | 2013-05-15 09:07:46 -0500 |
| commit | 122ac9fd46d7c9ac198bf980df4f038247eb0ba5 (patch) | |
| tree | 19c837c5c00390147ea5cfe48fc57fca03a219aa /actionpack/lib/action_view/helpers/asset_url_helper.rb | |
| parent | e2f3e502291d3d9fa8d5f0f65644c961ec020c69 (diff) | |
| download | rails-122ac9fd46d7c9ac198bf980df4f038247eb0ba5.tar.gz rails-122ac9fd46d7c9ac198bf980df4f038247eb0ba5.tar.bz2 rails-122ac9fd46d7c9ac198bf980df4f038247eb0ba5.zip | |
restore ability to return nil from asset_host proc, add test
Diffstat (limited to 'actionpack/lib/action_view/helpers/asset_url_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_url_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_url_helper.rb b/actionpack/lib/action_view/helpers/asset_url_helper.rb index 71b78cf0b5..b5f2df76ab 100644 --- a/actionpack/lib/action_view/helpers/asset_url_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_url_helper.rb @@ -193,7 +193,6 @@ module ActionView request = self.request if respond_to?(:request) host = config.asset_host if defined? config.asset_host host ||= request.base_url if request && options[:protocol] == :request - return unless host if host.respond_to?(:call) arity = host.respond_to?(:arity) ? host.arity : host.method(:call).arity @@ -204,6 +203,8 @@ module ActionView host = host % (Zlib.crc32(source) % 4) end + return unless host + if host =~ URI_REGEXP host else |