rails / rails fork watch download tarball
public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Search Repo: 
Do filter condition lookup against the actual hash

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4180 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Marcel Molina (author)
Wed Apr 05 21:50:45 -0700 2006
commit  ac97c7a90e5fd1799b1239210a42f8f35c383998
tree    7e13f6eda8a8f585534fe613761de72ebd54bce9
parent  31d8169e3ecb0a63db3a3bd6130f5d8bbcd0f39a
0
actionpack/lib/action_controller/filters.rb 
...
338
339
340
341
 
342
343
344
 
...
338
339
340
 
341
342
343
344
 
0
@@ -338,7 +338,7 @@ module ActionController #:nodoc:
0
         def remove_contradicting_conditions!(filters, conditions)
0
           return unless conditions[:only]
0
           filters.each do |filter|
0
-            next unless included_actions_for_filter = included_actions[filter]
0
+            next unless included_actions_for_filter = (read_inheritable_attribute('included_actions') || {})[filter]
0
             [*conditions[:only]].each do |conditional_action|
0
               conditional_action = conditional_action.to_s
0
               included_actions_for_filter.delete(conditional_action) if included_actions_for_filter.include?(conditional_action)

Comments

    No one has commented yet.