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

Haml wrap_layout passes again

Browse source
This commit is contained in:
Thomas Reynolds 2012-06-02 14:19:45 -07:00
parent 239f80c1f9
commit e26b68635f
5 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -329,6 +329,14 @@ module Middleman
def wrap_layout(layout_name, &block)
# Save current buffer for later
@_out_buf, _buf_was = "", @_out_buf
layout_path = locate_layout(layout_name, current_engine)
extension = File.extname(layout_path)
engine = extension[1..-1].to_sym
# Store last engine for later (could be inside nested renders)
@current_engine, engine_was = engine, @current_engine
begin
content = if block_given?
@ -341,14 +349,6 @@ module Middleman
@_out_buf = _buf_was
end
layout_path = locate_layout(layout_name, current_engine)
extension = File.extname(layout_path)
engine = extension[1..-1].to_sym
# Store last engine for later (could be inside nested renders)
@current_engine, engine_was = engine, @current_engine
concat_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
ensure
@current_engine = engine_was