diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-07 09:35:24 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-07 09:35:24 -0700 |
| commit | a7c5d40d80179c19a249bed7a5f808dadf92b54c (patch) | |
| tree | 96bf63a29e68898a0add3a93664c4fdd11801841 /actionpack/lib/action_dispatch/middleware | |
| parent | 1e90229e044b82846078d370a9539bd2457793b9 (diff) | |
| parent | 0e624ce9eb9056c8986621f3e6b7f5ca67b4cb12 (diff) | |
| download | rails-a7c5d40d80179c19a249bed7a5f808dadf92b54c.tar.gz rails-a7c5d40d80179c19a249bed7a5f808dadf92b54c.tar.bz2 rails-a7c5d40d80179c19a249bed7a5f808dadf92b54c.zip | |
Merge branch 'master' of github.com:rails/rails
* 'master' of github.com:rails/rails:
Cache flash now
Revert "Use freeze instead of close!"
Revert "Eagerly load Signed and Permanent cookies"
cookies here
Eagerly load Signed and Permanent cookies
Use freeze instead of close!
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/flash.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index b5194c675c..027ff7f8ac 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -149,7 +149,7 @@ module ActionDispatch # # Entries set via <tt>now</tt> are accessed the same way as standard entries: <tt>flash['my-key']</tt>. def now - FlashNow.new(self) + @now ||= FlashNow.new(self) end # Keeps either the entire current flash or a specific flash entry available for the next action: |