diff options
| author | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-12-31 01:10:42 +0000 |
|---|---|---|
| committer | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-12-31 01:10:42 +0000 |
| commit | 04bc40ff501b1bf81bec7ce3937cb06c896ffc69 (patch) | |
| tree | 88a33663195900df8a7307aefa2c9aaa561c3973 /actionpack/lib/action_view/buffers.rb | |
| parent | 84eece0a823e9c601ea99a8709f24605a19bcbfd (diff) | |
| parent | ed17983ec56dec689a0311c7f8fcbeba9874e5a4 (diff) | |
| download | rails-04bc40ff501b1bf81bec7ce3937cb06c896ffc69.tar.gz rails-04bc40ff501b1bf81bec7ce3937cb06c896ffc69.tar.bz2 rails-04bc40ff501b1bf81bec7ce3937cb06c896ffc69.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_view/buffers.rb')
| -rw-r--r-- | actionpack/lib/action_view/buffers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/buffers.rb b/actionpack/lib/action_view/buffers.rb index be7f65c2ce..2372d3c433 100644 --- a/actionpack/lib/action_view/buffers.rb +++ b/actionpack/lib/action_view/buffers.rb @@ -4,7 +4,7 @@ module ActionView class OutputBuffer < ActiveSupport::SafeBuffer #:nodoc: def initialize(*) super - encode! if encoding_aware? + encode! end def <<(value) |