deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #941 from krautcomputing/fix_content_tag_helper

Browse source 
Fix content_tag helper, only try to mark content as safe if it is not a hash of options
This commit is contained in:
Thomas Reynolds 2013-06-18 11:01:28 -07:00
parent 0e69928939 c75e31ae94
commit 298e842510
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
View file

@ -50,7 +50,8 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
# Make all block content html_safe
def content_tag(name, content = nil, options = nil, &block)
mark_safe(super(name, mark_safe(content), options, &block))
content = mark_safe(content) unless content.is_a?(Hash)
mark_safe(super(name, content, options, &block))
end
def capture_html(*args, &block)