diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-07-04 14:13:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 14:13:54 -0400 |
| commit | 153a32b9a098295cc2db98df11fb6bbc811601e4 (patch) | |
| tree | 991583343b8b320a02cb6618223ebf738684ac19 /activesupport/lib | |
| parent | 90e2739d8680878b40224d68b366917b9c582ba5 (diff) | |
| parent | 6cf7a0b0e9eaaa57fba0b0cea0f3015664baa0d8 (diff) | |
| download | rails-153a32b9a098295cc2db98df11fb6bbc811601e4.tar.gz rails-153a32b9a098295cc2db98df11fb6bbc811601e4.tar.bz2 rails-153a32b9a098295cc2db98df11fb6bbc811601e4.zip | |
Merge pull request #33289 from Edouard-chin/ec-lazy-load-hooks
Use class_eval or instance_eval when triggering lazy load hooks
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/lazy_load_hooks.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/lazy_load_hooks.rb b/activesupport/lib/active_support/lazy_load_hooks.rb index dc8080c469..97fe8a06c1 100644 --- a/activesupport/lib/active_support/lazy_load_hooks.rb +++ b/activesupport/lib/active_support/lazy_load_hooks.rb @@ -68,7 +68,11 @@ module ActiveSupport if options[:yield] block.call(base) else - base.instance_eval(&block) + if base.is_a?(Class) || base.is_a?(Module) + base.class_eval(&block) + else + base.instance_eval(&block) + end end end end |