From 26528e2c54e2095ed3fa44aec7b53e63f3c95f70 Mon Sep 17 00:00:00 2001
From: Elad Meidar <elad@eizesus.com>
Date: Fri, 25 Sep 2009 01:24:05 -0400
Subject: [PATCH] LH2878 fixed an exisiting patch to apply on 2-3-stable

---
 .../lib/action_view/helpers/asset_tag_helper.rb    |    5 ++++-
 actionpack/test/template/asset_tag_helper_test.rb  |    2 ++
 2 files changed, 6 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 babb9db..1bc3e98 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -486,6 +486,8 @@ module ActionView
       #    <img src="/images/mouse.png" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" alt="Mouse" />
       #  image_tag("mouse.png", :mouseover => image_path("mouse_over.png")) # =>
       #    <img src="/images/mouse.png" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" alt="Mouse" />
+      #  image_tag("/escape.html?foo=bar&something=something-else", :escape => false) # =>
+      #    <img src="/escape.html?foo=bar&something=something-else" alt="Escape" />
       def image_tag(source, options = {})
         options.symbolize_keys!
 
@@ -501,7 +503,8 @@ module ActionView
           options[:onmouseout]  = "this.src='#{image_path(options[:src])}'"
         end
 
-        tag("img", options)
+        escape = options.delete(:escape)
+        tag("img", options, false, escape.nil? ? true : escape)
       end
 
       def self.cache_asset_timestamps
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 7ffabff..ea56465 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -137,6 +137,8 @@ class AssetTagHelperTest < ActionView::TestCase
     %(image_tag("error.png", "size" => "x")) => %(<img alt="Error" src="/images/error.png" />),
     %(image_tag("http://www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />),
     %(image_tag("http://www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />),
+    %(image_tag("/escape.html?foo=bar&something=something-else")) => %(<img alt="Escape" src="/escape.html?foo=bar&amp;something=something-else" />),
+    %(image_tag("/escape.html?foo=bar&something=something-else", :escape => false)) => %(<img alt="Escape" src="/escape.html?foo=bar&something=something-else" />),
     %(image_tag("mouse.png", :mouseover => "/images/mouse_over.png")) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
     %(image_tag("mouse.png", :mouseover => image_path("mouse_over.png"))) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />)
   }
-- 
1.6.0.2