aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG3
-rwxr-xr-xactionpack/lib/action_controller.rb2
2 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 81acf0c9dd..705cda5f4a 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,8 @@
*SVN*
+* Added search through session to clear out association caches at the end of each request. This makes it possible to place Active Record objects
+ in the session without worrying about stale data in the associations (the main object is still subject to caching, naturally) #347 [Tobias Luetke]
+
* Added more informative exception when using helper :some_helper and the helper requires another file that fails, you'll get an
error message tells you what file actually failed to load, rather than falling back on assuming it was the helper file itself #346 [dblack]
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 8bfa6bd907..dc2609662c 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -32,6 +32,7 @@ require 'action_controller/benchmarking'
require 'action_controller/filters'
require 'action_controller/layout'
require 'action_controller/flash'
+require 'action_controller/session'
require 'action_controller/dependencies'
require 'action_controller/scaffolding'
require 'action_controller/helpers'
@@ -48,6 +49,7 @@ ActionController::Base.class_eval do
include ActionController::Scaffolding
include ActionController::Helpers
include ActionController::Cookies
+ include ActionController::Session
end
require 'action_view'