1 files changed, 16 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb
index 28480e47b6..a9c850c49d 100644
--- a/actionpack/lib/action_controller/components.rb
+++ b/actionpack/lib/action_controller/components.rb
@@ -51,6 +51,9 @@ module ActionController #:nodoc:
         
         alias_method :set_session_options_without_components, :set_session_options
         alias_method :set_session_options, :set_session_options_with_components
+        
+        alias_method :flash_without_components, :flash
+        alias_method :flash, :flash_with_components
       end
       
       # If this controller was instantiated to process a component request,
@@ -110,6 +113,19 @@ module ActionController #:nodoc:
           end
         end
 
+        def flash_with_components(refresh = false)
+          if @flash.nil? || refresh
+            @flash = 
+              if @parent_controller
+                @parent_controller.flash
+              else
+                flash_without_components
+              end
+          end
+          
+          @flash
+        end
+
       private
         def component_response(options, reuse_response)
           klass    = component_class(options)