0
@@ -435,9 +435,11 @@ module ActionView
0
               else
0
                 source = "/#{dir}/#{source}" unless source[0] == ?/
0
                 if has_request
0
-                  source = "#{@controller.request.relative_url_root}#{source}"
0
+                  unless source =~ %r{^#{@controller.request.relative_url_root}/}
0
+                    source = "#{@controller.request.relative_url_root}#{source}"
0
+                  end
0
                 end
0
-                rewrite_asset_path!(source)
0
+                source = rewrite_asset_path(source)
0
 
0
                 if include_host
0
                   host = compute_asset_host(source)
0
@@ -484,11 +486,15 @@ module ActionView
0
           end
0
         end
0
 
0
-        # Break out the asset path rewrite so you wish to put the asset id
0
+        # Break out the asset path rewrite in case plugins wish to put the asset id
0
         # someplace other than the query string.
0
-        def rewrite_asset_path!(source)
0
+        def rewrite_asset_path(source)
0
           asset_id = rails_asset_id(source)
0
-          source << "?#{asset_id}" if !asset_id.blank?
0
+          if asset_id.blank?
0
+            source
0
+          else
0
+            source + "?#{asset_id}"
0
+          end
0
         end
0
 
0
         def javascript_src_tag(source, options)

0
@@ -392,6 +392,8 @@ class AssetTagHelperNonVhostTest < Test::Unit::TestCase
0
     assert_dom_equal(%(/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
0
     assert_dom_equal(%(/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
0
     assert_dom_equal(%(/collaboration/hieraki/images/xml.png), image_path("xml.png"))
0
+    assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse.png'" src="/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
0
+    assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse2.png'" src="/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
0
   end
0
   
0
   def test_should_ignore_relative_root_path_on_complete_url
0
@@ -404,6 +406,8 @@ class AssetTagHelperNonVhostTest < Test::Unit::TestCase
0
     assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
0
     assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
0
     assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
0
+    assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='http://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='http://assets.example.com/collaboration/hieraki/images/mouse.png'" src="http://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
0
+    assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='http://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='http://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="http://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
0
   ensure
0
     ActionController::Base.asset_host = ""
0
   end