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

use latest padrino

Browse source
This commit is contained in:
Thomas Reynolds 2013-06-04 09:56:33 -07:00
parent 39d3fa01ad
commit 69c36e691f
209 changed files with 2754 additions and 719 deletions
Download patch file Download diff file Expand all files Collapse all files

3
middleman-core/lib/middleman-core/core_extensions/rendering.rb
View file

@ -413,8 +413,7 @@ module Middleman
@_out_buf = _buf_was
end
# concat_safe_content
concat_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
concat_safe_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
ensure
@current_engine = engine_was
end

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

@ -1,6 +1,6 @@
if defined?(::Padrino::Helpers)
require 'vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite'
require 'vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers'
if !defined?(::Padrino::Helpers)
require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
end
module Middleman