diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-07 15:40:28 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-07 15:40:28 -0700 |
| commit | a0f904143be570f079b03d0e242262cfa30dbcb7 (patch) | |
| tree | 63860f699d76d5335bcb49c148530b3b6a05b69f /activesupport/lib | |
| parent | 2b5e4f7f983a891bfcf288fba386cc534e64223e (diff) | |
| parent | 2ed9ab2ed67d4da7348e831ba76d02a0347a583e (diff) | |
| download | rails-a0f904143be570f079b03d0e242262cfa30dbcb7.tar.gz rails-a0f904143be570f079b03d0e242262cfa30dbcb7.tar.bz2 rails-a0f904143be570f079b03d0e242262cfa30dbcb7.zip | |
Merge pull request #10506 from seanwalbran/fix-10502-skip-object-filter
fix issue #10502, do not recompute method name for already-stringified object callback filter
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 893c2500d7..1dcacf0b12 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -133,7 +133,7 @@ module ActiveSupport end def matches?(_kind, _filter) - if @_is_object_filter + if @_is_object_filter && !_filter.is_a?(String) _filter_matches = @filter.to_s.start_with?(_method_name_for_object_filter(_kind, _filter, false)) else _filter_matches = (@filter == _filter) |