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

Merge pull request #959 from agorf/master

Browse source 
Stuff is double-escaped in meta pages (config, sitemap)
This commit is contained in:
Thomas Reynolds 2013-07-12 13:25:09 -07:00
commit 40cf047a9b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-core/meta_pages/config_setting.rb
View file

@ -15,11 +15,11 @@ module Middleman
key_classes << 'modified' if @setting.value_set? key_classes << 'modified' if @setting.value_set?
content << content_tag(:span, @setting.key.inspect, :class => key_classes.join(' ')) content << content_tag(:span, @setting.key.inspect, :class => key_classes.join(' '))
content << " = " content << " = "
content << content_tag(:span, CGI::escapeHTML(@setting.value.inspect), :class => 'value') content << content_tag(:span, @setting.value.inspect, :class => 'value')
if @setting.default if @setting.default
content << content_tag(:span, :class => 'default') do content << content_tag(:span, :class => 'default') do
if @setting.value_set? if @setting.value_set?
"Default: #{CGI::escapeHTML(@setting.default.inspect)}" "Default: #{@setting.default.inspect}"
else else
"(Default)" "(Default)"
end end

4
middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb
View file

@ -23,10 +23,10 @@ module Middleman
row_content = "" row_content = ""
row_content << content_tag(:th, label) row_content << content_tag(:th, label)
row_content << content_tag(:td, value) row_content << content_tag(:td, value)
row_content row_content.html_safe
end end
end end
content content.html_safe
end end
end end
end end