diff options
Diffstat (limited to 'actionpack/lib/action_controller/components.rb')
-rw-r--r-- | actionpack/lib/action_controller/components.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb index 4d5dc20ab1..c05b1eb068 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -111,16 +111,15 @@ module ActionController #:nodoc: end def flash_with_components(refresh = false) #:nodoc: - if !defined?(@flash) || refresh - @flash = + if !defined?(@_flash) || refresh + @_flash = if defined?(@parent_controller) @parent_controller.flash else flash_without_components end end - - @flash + @_flash end private |