aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/cookies.rb4
2 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 0aaa1a51f2..3d0e645a14 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Expose the cookie jar as a helper method (before the view would just get the raw cookie hash) [DHH]
+
* Integration tests: get_ and post_via_redirect take a headers hash. #9130 [simonjefford]
* Simplfy #view_paths implementation. ActionView templates get the exact object, not a dup. [Rick]
diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb
index c40ef341a1..f36f9031d2 100644
--- a/actionpack/lib/action_controller/cookies.rb
+++ b/actionpack/lib/action_controller/cookies.rb
@@ -27,6 +27,10 @@ module ActionController #:nodoc:
# * <tt>http_only</tt> - whether this cookie is accessible via scripting or only HTTP (defaults to false).
module Cookies
+ def self.included(base)
+ base.helper_method :cookies
+ end
+
protected
# Returns the cookie container, which operates as described above.
def cookies