From 1e08d11579f0080f086a6bfea1693826a0c09c95 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Fri, 30 Sep 2005 19:10:20 +0000 Subject: Don't prepend the asset host if the string is already a fully-qualified URL git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2430 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/asset_tag_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 23d691bb13..a79c01574b 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -131,7 +131,8 @@ module ActionView source = "/#{dir}/#{source}" unless source.first == "/" || source.include?(":") source = "#{source}.#{ext}" unless source.include?(".") source = "#{@controller.request.relative_url_root}#{source}" unless %r{^[-a-z]+://} =~ source - ActionController::Base.asset_host + source + source = ActionController::Base.asset_host + source unless source.include?(":") + source end end end -- cgit v1.2.3