From c75e31ae94edbc34b6eee6a72ac1eed32f23e040 Mon Sep 17 00:00:00 2001 From: Manuel Meurer Date: Tue, 18 Jun 2013 10:12:38 +0200 Subject: [PATCH] Fix content_tag helper, only try to mark content as safe if it is not a hash of options --- .../lib/middleman-more/core_extensions/default_helpers.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb index aa030882..fb4a8686 100644 --- a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb +++ b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb @@ -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)