From 473e5bde747d227d47d00e9b5f52b668b29f53df Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 19 May 2005 18:06:12 +0000
Subject: 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
---
 actionpack/CHANGELOG                                   | 2 ++
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 +-
 actionpack/test/template/asset_tag_helper_test.rb      | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 28912cba3e..cd7d8591fc 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* 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]
+
 * Added support for descending year values in DateHelper#select_year, like select_year(Date.today, :start_year => 2005, :end_year => 1900), which would count down from 2005 to 1900 instead of the other way #1274 [nwoods@mail.com]
 
 * Fixed that FormHelper#checkbox should return a checked checkbox if the value is the same as checked_value #1286 [Florian Weber]
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
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 9ceec5b040..f558bc1bbc 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -143,6 +143,7 @@ class AssetTagHelperNonVhostTest < Test::Unit::TestCase
     %(image_tag("xml")) => %(<img alt="Xml" src="/calloboration/hieraki/images/xml.png" />),
     %(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/calloboration/hieraki/images/rss.png" />),
     %(image_tag("gold", :size => "45x70")) => %(<img alt="Gold" height="70" src="/calloboration/hieraki/images/gold.png" width="45" />),
+    %(image_tag("http://www.example.com/images/icon.gif")) => %(<img alt="Icon" src="http://www.example.com/images/icon.gif" />),
   }
 
   def test_auto_discovery
-- 
cgit v1.2.3