From ac97c7a90e5fd1799b1239210a42f8f35c383998 Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Thu, 6 Apr 2006 04:50:45 +0000 Subject: [PATCH] Do filter condition lookup against the actual hash git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/filters.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb index 1c957e7120c3e..01a4b9fba1134 100644 --- a/actionpack/lib/action_controller/filters.rb +++ b/actionpack/lib/action_controller/filters.rb @@ -338,7 +338,7 @@ def condition_hash(filters, *actions) 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)