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

Changeset 5715

Show
Ignore:
Timestamp:
12/12/06 22:26:37 (2 years ago)
Author:
bitsweat
Message:

Correctly report which filter halted the chain. References #6699.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r5709 r5715  
    11*SVN* 
     2 
     3* Correctly report which filter halted the chain.  #6699 [Martin Emde] 
    24 
    35* Fix a bug in Routing where a parameter taken from the path of the current request could not be used as a query parameter for the next. Closes #6752. [Nicholas Seckar] 

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

    r5331 r5715  
    617617 
    618618      def perform_action_with_filters 
    619         #result = perform_filters do 
    620         #  perform_action_without_filters unless performed? 
    621         #end 
    622         @before_filter_chain_aborted = (call_filter(self.class.filter_chain, 0) == false) 
     619        call_filter(self.class.filter_chain, 0) 
    623620      end 
    624621 
    …… 
    641638          halted = call_filter(chain, index.next) 
    642639        end 
    643         halt_filter_chain(filter.filter, :no_yield) if halted == false 
     640        halt_filter_chain(filter.filter, :no_yield) if halted == false unless @before_filter_chain_aborted 
    644641        halted 
    645642      end 
    …… 
    654651          end 
    655652        end 
     653        @before_filter_chain_aborted = true 
    656654        return false 
    657655      end