mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Make safe_append= live on AV::OutputBuffer not AS::SafeBuffer
Conflicts: actionpack/lib/action_view/template/handlers/erb.rb
This commit is contained in:
parent
f04ec6a227
commit
9ecaa80300
2 changed files with 1 additions and 1 deletions
|
@ -15,6 +15,7 @@ module ActionView
|
||||||
super(value.to_s)
|
super(value.to_s)
|
||||||
end
|
end
|
||||||
alias :append= :<<
|
alias :append= :<<
|
||||||
|
alias :safe_append= :safe_concat
|
||||||
end
|
end
|
||||||
|
|
||||||
class Template
|
class Template
|
||||||
|
|
|
@ -73,7 +73,6 @@ end
|
||||||
module ActiveSupport #:nodoc:
|
module ActiveSupport #:nodoc:
|
||||||
class SafeBuffer < String
|
class SafeBuffer < String
|
||||||
alias safe_concat concat
|
alias safe_concat concat
|
||||||
alias safe_append= concat
|
|
||||||
|
|
||||||
def concat(value)
|
def concat(value)
|
||||||
if value.html_safe?
|
if value.html_safe?
|
||||||
|
|
Loading…
Reference in a new issue