aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2010-11-08 10:10:30 +1300
committerMichael Koziarski <michael@koziarski.com>2010-11-08 10:10:30 +1300
commit9ecaa803001aa95ff9010c8f5aef71c009577ead (patch)
tree5319e4cef37403c97e3eb35a2361b9d20c12df0e /actionpack
parentf04ec6a227b702342d2fb841f94915499bf6101a (diff)
downloadrails-9ecaa803001aa95ff9010c8f5aef71c009577ead.tar.gz
rails-9ecaa803001aa95ff9010c8f5aef71c009577ead.tar.bz2
rails-9ecaa803001aa95ff9010c8f5aef71c009577ead.zip
Make safe_append= live on AV::OutputBuffer not AS::SafeBuffer
Conflicts: actionpack/lib/action_view/template/handlers/erb.rb
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/template/handlers/erb.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 4c1f3d70ca..0803114f44 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -15,6 +15,7 @@ module ActionView
super(value.to_s)
end
alias :append= :<<
+ alias :safe_append= :safe_concat
end
class Template