diff options
Diffstat (limited to 'actionpack/lib/action_controller/filters.rb')
| -rw-r--r-- | actionpack/lib/action_controller/filters.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb index 83e3045859..7652d8803c 100644 --- a/actionpack/lib/action_controller/filters.rb +++ b/actionpack/lib/action_controller/filters.rb @@ -202,10 +202,11 @@ module ActionController #:nodoc: # A#after # B#after def append_around_filter(*filters) + conditions = extract_conditions!(filters) for filter in filters.flatten ensure_filter_responds_to_before_and_after(filter) - append_before_filter { |c| filter.before(c) } - prepend_after_filter { |c| filter.after(c) } + append_before_filter(conditions || {}) { |c| filter.before(c) } + prepend_after_filter(conditions || {}) { |c| filter.after(c) } end end |