diff options
author | Niels Ganser <niels@herimedia.com> | 2009-05-27 14:51:33 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-05-27 14:51:33 -0500 |
commit | bb8e5843f32b13e759da51a4713a31b23ebcac6d (patch) | |
tree | 513ac774022e66b0c49da6a09760ab799e5c7fa7 /actionpack/lib | |
parent | 746f3860c197d351ab8f2c860d857b139ce8cbf8 (diff) | |
download | rails-bb8e5843f32b13e759da51a4713a31b23ebcac6d.tar.gz rails-bb8e5843f32b13e759da51a4713a31b23ebcac6d.tar.bz2 rails-bb8e5843f32b13e759da51a4713a31b23ebcac6d.zip |
ActionController::Flash::FlashHash.use now returns either the value corresponding to the passed key or itself when no key is passed [#1792 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/base/chained/flash.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/base/chained/flash.rb b/actionpack/lib/action_controller/base/chained/flash.rb index 6bd482d85a..7a8dd2dcf9 100644 --- a/actionpack/lib/action_controller/base/chained/flash.rb +++ b/actionpack/lib/action_controller/base/chained/flash.rb @@ -135,12 +135,11 @@ module ActionController #:nodoc: # use('msg') # marks the "msg" entry as used # use(nil, false) # marks the entire flash as unused (keeps it around for one more action) # use('msg', false) # marks the "msg" entry as unused (keeps it around for one more action) - def use(k=nil, v=true) - unless k.nil? - @used[k] = v - else - keys.each{ |key| use(key, v) } - end + # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself + # if no key is passed. + def use(key = nil, used = true) + Array(key || keys).each { |k| @used[k] = used } + return key ? self[key] : self end end |