diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-04-06 04:50:45 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-04-06 04:50:45 +0000 |
| commit | ac97c7a90e5fd1799b1239210a42f8f35c383998 (patch) | |
| tree | 7e13f6eda8a8f585534fe613761de72ebd54bce9 /actionpack | |
| parent | 31d8169e3ecb0a63db3a3bd6130f5d8bbcd0f39a (diff) | |
| download | rails-ac97c7a90e5fd1799b1239210a42f8f35c383998.tar.gz rails-ac97c7a90e5fd1799b1239210a42f8f35c383998.tar.bz2 rails-ac97c7a90e5fd1799b1239210a42f8f35c383998.zip | |
Do filter condition lookup against the actual hash
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -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 1c957e7120..01a4b9fba1 100644 --- a/actionpack/lib/action_controller/filters.rb +++ b/actionpack/lib/action_controller/filters.rb @@ -338,7 +338,7 @@ module ActionController #:nodoc: def remove_contradicting_conditions!(filters, conditions) return unless conditions[:only] filters.each do |filter| - next unless included_actions_for_filter = included_actions[filter] + next unless included_actions_for_filter = (read_inheritable_attribute('included_actions') || {})[filter] [*conditions[:only]].each do |conditional_action| conditional_action = conditional_action.to_s included_actions_for_filter.delete(conditional_action) if included_actions_for_filter.include?(conditional_action) |