Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 4180

Show
Ignore:
Timestamp:
04/06/06 04:50:45 (3 years ago)
Author:
marcel
Message:

Do filter condition lookup against the actual hash

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller/filters.rb

    r4167 r4180  
    339339          return unless conditions[:only] 
    340340          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] 
    342342            [*conditions[:only]].each do |conditional_action| 
    343343              conditional_action = conditional_action.to_s