diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-19 18:06:12 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-19 18:06:12 +0000 |
| commit | 473e5bde747d227d47d00e9b5f52b668b29f53df (patch) | |
| tree | 74feb0c5e571e1e4813e97a9bb6ffd23fc60102a /actionpack/lib | |
| parent | 202d5c0751ac9efde2235102fb2099f4cbe93fd6 (diff) | |
| download | rails-473e5bde747d227d47d00e9b5f52b668b29f53df.tar.gz rails-473e5bde747d227d47d00e9b5f52b668b29f53df.tar.bz2 rails-473e5bde747d227d47d00e9b5f52b668b29f53df.zip | |
Fixed that compute_public_path should recognize external URLs, so image_tag("http://www.example.com/images/icon.gif") is not prefixed with the relative url path #1254 [victor-ronr-trac@carotena.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1321 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -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 c3ee24df84..de507c6ceb 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -109,7 +109,7 @@ module ActionView def compute_public_path(source, dir, ext) source = "/#{dir}/#{source}" unless source.include?("/") source = "#{source}.#{ext}" unless source.include?(".") - source = "#{@request.relative_url_root}#{source}" + source = "#{@request.relative_url_root}#{source}" unless %r{^[-a-z]+://} =~ source ActionController::Base.asset_host + source end end |