diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-25 16:42:45 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-25 16:42:45 -0800 |
commit | 0e13941dbe9c4840175e5c6f5b2c3f572249a4ec (patch) | |
tree | 39990d4819a4fba216b1ceb258fa61b0d649856d /actionview/lib/action_view/file_template.rb | |
parent | 3a8d5dac9aa82d9d775c04d70230a2e0b404e162 (diff) | |
download | rails-0e13941dbe9c4840175e5c6f5b2c3f572249a4ec.tar.gz rails-0e13941dbe9c4840175e5c6f5b2c3f572249a4ec.tar.bz2 rails-0e13941dbe9c4840175e5c6f5b2c3f572249a4ec.zip |
`original_encoding` isn't used, so deprecate it and remove the ivar
Diffstat (limited to 'actionview/lib/action_view/file_template.rb')
-rw-r--r-- | actionview/lib/action_view/file_template.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/file_template.rb b/actionview/lib/action_view/file_template.rb index cdc077a01a..dea02176eb 100644 --- a/actionview/lib/action_view/file_template.rb +++ b/actionview/lib/action_view/file_template.rb @@ -22,11 +22,11 @@ module ActionView # to ensure that references to the template object can be marshalled as well. This means forgoing # the marshalling of the compiler mutex and instantiating that again on unmarshalling. def marshal_dump # :nodoc: - [ @identifier, @handler, @compiled, @original_encoding, @locals, @virtual_path, @updated_at, @format, @variant ] + [ @identifier, @handler, @compiled, @locals, @virtual_path, @updated_at, @format, @variant ] end def marshal_load(array) # :nodoc: - @identifier, @handler, @compiled, @original_encoding, @locals, @virtual_path, @updated_at, @format, @variant = *array + @identifier, @handler, @compiled, @locals, @virtual_path, @updated_at, @format, @variant = *array @compile_mutex = Mutex.new end end |