aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/filters.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/filters.rb')
-rw-r--r--actionpack/lib/action_controller/filters.rb20
1 files changed, 11 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb
index 3290defff8..ec5bb759df 100644
--- a/actionpack/lib/action_controller/filters.rb
+++ b/actionpack/lib/action_controller/filters.rb
@@ -615,15 +615,6 @@ module ActionController #:nodoc:
end
end
- def perform_action_with_filters
- call_filter(self.class.filter_chain, 0)
- end
-
- def process_with_filters(request, response, method = :perform_action, *arguments) #:nodoc:
- @before_filter_chain_aborted = false
- process_without_filters(request, response, method, *arguments)
- end
-
def filter_chain
self.class.filter_chain
end
@@ -654,7 +645,18 @@ module ActionController #:nodoc:
return false
end
+ protected
+
+ def process_with_filters(request, response, method = :perform_action, *arguments) #:nodoc:
+ @before_filter_chain_aborted = false
+ process_without_filters(request, response, method, *arguments)
+ end
+
private
+ def perform_action_with_filters
+ call_filter(self.class.filter_chain, 0)
+ end
+
def process_cleanup_with_filters
if @before_filter_chain_aborted
close_session