diff options
| author | Jeff Latz <jeff@pumpone.com> | 2017-02-14 14:47:30 -0500 |
|---|---|---|
| committer | Jeff Latz <jeff@pumpone.com> | 2017-02-24 12:12:07 -0500 |
| commit | a72498f776b2e67b7e3a074423181defcd06fc56 (patch) | |
| tree | 0b4e055ad1ae86650cca1e51863016ae6dbd291d /activesupport/lib/active_support | |
| parent | 87b2b6c5124732ff709b8e1900a99ba0a08f6982 (diff) | |
| download | rails-a72498f776b2e67b7e3a074423181defcd06fc56.tar.gz rails-a72498f776b2e67b7e3a074423181defcd06fc56.tar.bz2 rails-a72498f776b2e67b7e3a074423181defcd06fc56.zip | |
add optional second argument to ActiveSupport core extension for Marshal#load so it can take a proc
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/marshal.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/marshal.rb b/activesupport/lib/active_support/core_ext/marshal.rb index edfc8296fe..bba2b3be2e 100644 --- a/activesupport/lib/active_support/core_ext/marshal.rb +++ b/activesupport/lib/active_support/core_ext/marshal.rb @@ -1,7 +1,7 @@ module ActiveSupport module MarshalWithAutoloading # :nodoc: - def load(source) - super(source) + def load(source, proc = nil) + super(source, proc) rescue ArgumentError, NameError => exc if exc.message.match(%r|undefined class/module (.+?)(?:::)?\z|) # try loading the class/module |