mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Streamline fragment_for SafeBuffer logic to make it more concise.
This commit is contained in:
parent
81f7bf55c7
commit
d12aa483f2
1 changed files with 3 additions and 6 deletions
|
@ -51,12 +51,9 @@ module ActionView
|
||||||
# This dance is needed because Builder can't use capture
|
# This dance is needed because Builder can't use capture
|
||||||
pos = output_buffer.length
|
pos = output_buffer.length
|
||||||
yield
|
yield
|
||||||
if output_buffer.is_a?(ActionView::OutputBuffer)
|
|
||||||
safe_output_buffer = output_buffer.to_str
|
|
||||||
fragment = safe_output_buffer.slice!(pos..-1)
|
|
||||||
self.output_buffer = ActionView::OutputBuffer.new(safe_output_buffer)
|
|
||||||
else
|
|
||||||
fragment = output_buffer.slice!(pos..-1)
|
fragment = output_buffer.slice!(pos..-1)
|
||||||
|
if output_buffer.kind_of?(ActiveSupport::SafeBuffer)
|
||||||
|
self.output_buffer = output_buffer.html_safe
|
||||||
end
|
end
|
||||||
controller.write_fragment(name, fragment, options)
|
controller.write_fragment(name, fragment, options)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue