Merge pull request #1401 from claudiob/bring-fix-1582-from-padrino-against-v3-stable

Import patch to bugfix from Padrino Helpers
This commit is contained in:
Eliott Appleford 2014-11-08 22:22:25 +00:00
commit 4f93adffcc

View file

@ -12,7 +12,7 @@ class Padrino::Helpers::OutputHelpers::ErbHandler
raw = block.call(*args)
captured = template.instance_variable_get(:@_out_buf)
self.output_buffer = _buf_was
engine_matches?(block) ? captured : raw
engine_matches?(block) && !captured.empty? ? captured : raw
end
end