aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-05-17 23:42:37 -0700
committerJosé Valim <jose.valim@gmail.com>2012-05-17 23:42:37 -0700
commit6bb86e1f3f7f9e11ee1c056d8742125173ecbce1 (patch)
treebadf71205ebaf4d4e23226a39de1e29bed38c8d4 /actionpack/lib/action_view/helpers
parentd8e8ab1c5351a3b8707143a787fed514b75a4144 (diff)
parent3e9ec2411abb079403f9f76d59f2a6386dd81768 (diff)
downloadrails-6bb86e1f3f7f9e11ee1c056d8742125173ecbce1.tar.gz
rails-6bb86e1f3f7f9e11ee1c056d8742125173ecbce1.tar.bz2
rails-6bb86e1f3f7f9e11ee1c056d8742125173ecbce1.zip
Merge pull request #5020 from KL-7/fix-blank-image_tag-source
Render img tag with empty src if empty string is passed to image_tag.
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index a7a4ce21ff..02c1250c76 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -274,7 +274,7 @@ module ActionView
# The alias +path_to_image+ is provided to avoid that. Rails uses the alias internally, and
# plugin authors are encouraged to do so.
def image_path(source)
- asset_paths.compute_public_path(source, 'images')
+ source.present? ? asset_paths.compute_public_path(source, 'images') : ""
end
alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
@@ -377,7 +377,7 @@ module ActionView
src = options[:src] = path_to_image(source)
- unless src =~ /^(?:cid|data):/
+ unless src =~ /^(?:cid|data):/ || src.blank?
options[:alt] = options.fetch(:alt){ image_alt(src) }
end