diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-04-03 22:59:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 22:59:43 -0400 |
| commit | 8648f289f01656b2258687126108c389127108e0 (patch) | |
| tree | 1ccb15f72f00d8c30497ad4e48f203545dd3383b /activesupport/lib/active_support/core_ext/marshal.rb | |
| parent | 28b3582aa2cd6007c708134b911b3f360ad5d659 (diff) | |
| parent | e8c33349bfabca28996ac74d344d69c7aaffec50 (diff) | |
| download | rails-8648f289f01656b2258687126108c389127108e0.tar.gz rails-8648f289f01656b2258687126108c389127108e0.tar.bz2 rails-8648f289f01656b2258687126108c389127108e0.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'activesupport/lib/active_support/core_ext/marshal.rb')
| -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 |