aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/session_store.rb
diff options
context:
space:
mode:
authorJosh Kalderimis <josh.kalderimis@gmail.com>2011-05-12 09:24:42 +0200
committerJosh Kalderimis <josh.kalderimis@gmail.com>2011-05-12 09:24:42 +0200
commita0000d0ea096dc3c6f811b57d006a80d59057e53 (patch)
tree284a7ce2bd46cad00c62a630cf1863982c774ca3 /activerecord/lib/active_record/session_store.rb
parent8cf4725f640603944bb6e69816807f6541c94d9f (diff)
downloadrails-a0000d0ea096dc3c6f811b57d006a80d59057e53.tar.gz
rails-a0000d0ea096dc3c6f811b57d006a80d59057e53.tar.bz2
rails-a0000d0ea096dc3c6f811b57d006a80d59057e53.zip
updated AR#create! to accept an options hash so the mass-assignment security role can be passed in, also updated the Changelog to mention the change to some of the AR method signatures.
Diffstat (limited to 'activerecord/lib/active_record/session_store.rb')
-rw-r--r--activerecord/lib/active_record/session_store.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 98e21db908..c3e976002e 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -40,7 +40,7 @@ module ActiveRecord
# You must implement these methods:
#
# self.find_by_session_id(session_id)
- # initialize(hash_of_session_id_and_data)
+ # initialize(hash_of_session_id_and_data, options_hash = {})
# attr_reader :session_id
# attr_accessor :data
# save
@@ -125,7 +125,7 @@ module ActiveRecord
end
end
- def initialize(attributes = nil)
+ def initialize(attributes = nil, options = {})
@data = nil
super
end