diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-07-24 16:48:57 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-07-24 16:48:57 +0000 |
| commit | edd68a587f412ccdf15613c663acbab341d45017 (patch) | |
| tree | 386437d0bb09c7944943b0590a5f80c60146e853 /actionpack/lib/action_controller/filters.rb | |
| parent | 34b081112536e382845e8dee146d884b4af20c4a (diff) | |
| download | rails-edd68a587f412ccdf15613c663acbab341d45017.tar.gz rails-edd68a587f412ccdf15613c663acbab341d45017.tar.bz2 rails-edd68a587f412ccdf15613c663acbab341d45017.zip | |
Refactored in use of extract_options! (closes #9079) [josh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7220 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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 |