diff options
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index 13e46789e9..f101c7b836 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -9,14 +9,6 @@ require 'stringio' require 'set' require 'yaml' -# Wire up YAML format compatibility with Rails 4.2. Makes the YAML parser call -# `init_with` when it encounters `!ruby/hash-with-ivars:ActionController::Parameters`, -# instead of trying to parse it as a regular hash subclass. -# Second `load_tags` is for compatibility with Psych prior to 2.0.9 where hashes -# were dumped without instance variables. -YAML.load_tags['!ruby/hash-with-ivars:ActionController::Parameters'] = 'ActionController::Parameters' -YAML.load_tags['!ruby/hash:ActionController::Parameters'] = 'ActionController::Parameters' - module ActionController # Raised when a required parameter is missing. # @@ -600,6 +592,15 @@ module ActionController "<#{self.class} #{@parameters} permitted: #{@permitted}>" end + def self.hook_into_yaml_loading # :nodoc: + # Wire up YAML format compatibility with Rails 4.2 and Psych 2.0.8 and 2.0.9+. + # Makes the YAML parser call `init_with` when it encounters the keys below + # instead of trying its own parsing routines. + YAML.load_tags['!ruby/hash-with-ivars:ActionController::Parameters'] = name + YAML.load_tags['!ruby/hash:ActionController::Parameters'] = name + end + hook_into_yaml_loading + def init_with(coder) # :nodoc: case coder.tag when '!ruby/hash:ActionController::Parameters' |