From 038139870825ad843b0683e5273dc4d11cb684b3 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Sun, 23 Mar 2008 01:48:17 +0000 Subject: Fix regression from filter refactoring where re-adding a skipped filter resulted in it being called twice. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9080 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/filters.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb index a822ffe4e4..218a9c0b80 100644 --- a/actionpack/lib/action_controller/filters.rb +++ b/actionpack/lib/action_controller/filters.rb @@ -264,6 +264,9 @@ module ActionController #:nodoc: def skip_filter_in_chain(*filters, &test) filters, conditions = extract_options(filters) + filters.each do |filter| + if callback = find_callback(filter) then delete(callback) end + end if conditions.empty? update_filter_in_chain(filters, :skip => conditions, &test) end -- cgit v1.2.3