aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-02-12 16:35:15 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-02-12 16:35:15 +0000
commitdb2023d4d2094416faa5aec7265fa21cb800b69e (patch)
treebe666781de9c6c46d4b3f68f05a27ce74d1cf5cc
parent93cba1207a22b0dc0e2a87769fb5b9fbc907bce7 (diff)
downloadrails-db2023d4d2094416faa5aec7265fa21cb800b69e.tar.gz
rails-db2023d4d2094416faa5aec7265fa21cb800b69e.tar.bz2
rails-db2023d4d2094416faa5aec7265fa21cb800b69e.zip
The session should be saved even if the filter chain is stopped
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3584 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/lib/action_controller/filters.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb
index 008486751d..0a6a648885 100644
--- a/actionpack/lib/action_controller/filters.rb
+++ b/actionpack/lib/action_controller/filters.rb
@@ -420,7 +420,11 @@ module ActionController #:nodoc:
end
def process_cleanup_with_filters
- process_cleanup_without_filters unless @before_filter_chain_aborted
+ if @before_filter_chain_aborted
+ close_session
+ else
+ process_cleanup_without_filters
+ end
end
end
end