Skip to content
This repository
Browse code

Do filter condition lookup against the actual hash

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit ac97c7a90e5fd1799b1239210a42f8f35c383998 1 parent 31d8169
authored April 06, 2006
2  actionpack/lib/action_controller/filters.rb
@@ -338,7 +338,7 @@ def condition_hash(filters, *actions)
338 338
         def remove_contradicting_conditions!(filters, conditions)
339 339
           return unless conditions[:only]
340 340
           filters.each do |filter|
341  
-            next unless included_actions_for_filter = included_actions[filter]
  341
+            next unless included_actions_for_filter = (read_inheritable_attribute('included_actions') || {})[filter]
342 342
             [*conditions[:only]].each do |conditional_action|
343 343
               conditional_action = conditional_action.to_s
344 344
               included_actions_for_filter.delete(conditional_action) if included_actions_for_filter.include?(conditional_action)

0 notes on commit ac97c7a

Please sign in to comment.
Something went wrong with that request. Please try again.