diff options
Diffstat (limited to 'actionpack/lib/action_controller/filters.rb')
| -rw-r--r-- | actionpack/lib/action_controller/filters.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb index c2f2c2a432..ec3f5096e3 100644 --- a/actionpack/lib/action_controller/filters.rb +++ b/actionpack/lib/action_controller/filters.rb @@ -601,7 +601,7 @@ module ActionController #:nodoc: def extract_conditions(*filters, &block) #:nodoc: filters.flatten! - conditions = filters.last.is_a?(Hash) ? filters.pop : {} + conditions = filters.extract_options! filters << block if block_given? return filters, conditions end |