kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Use ActionView::OutputBuffer#safe_append= from templates

Browse source
This commit is contained in:
Aman Gupta 2013-03-04 20:36:25 -08:00
parent 40936da372
commit b1c4469f9c
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
actionpack/lib/action_view/buffers.rb
View file

@ -8,9 +8,15 @@ module ActionView
end
def <<(value)
return self if value.nil?
super(value.to_s)
end
alias :append= :<<
def safe_concat(value)
return self if value.nil?
super(value.to_s)
end
alias :safe_append= :safe_concat
end

6
actionpack/lib/action_view/template/handlers/erb.rb
View file

@ -11,7 +11,7 @@ module ActionView
def add_text(src, text)
return if text.empty?
src << "@output_buffer.safe_concat('" << escape_text(text) << "');"
src << "@output_buffer.safe_append='" << escape_text(text) << "';"
end
# Erubis toggles <%= and <%== behavior when escaping is enabled.
@ -31,7 +31,7 @@ module ActionView
if code =~ BLOCK_EXPR
src << '@output_buffer.append= ' << code
else
src << '@output_buffer.append= (' << code << ');'
src << '@output_buffer.append=(' << code << ');'
end
end
@ -39,7 +39,7 @@ module ActionView
if code =~ BLOCK_EXPR
src << "@output_buffer.safe_append= " << code
else
src << "@output_buffer.safe_concat((" << code << ").to_s);"
src << "@output_buffer.safe_append=(" << code << ");"
end
end