From 324fa688fcd8f5b6a8e9a0226b0cb3d2829e122c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 2 Dec 2009 22:48:05 -0200
Subject: Make controller.flash public to be used in responders.

Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
---
 actionpack/lib/action_controller/metal/flash.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb
index f43900faa0..b2d44c6c63 100644
--- a/actionpack/lib/action_controller/metal/flash.rb
+++ b/actionpack/lib/action_controller/metal/flash.rb
@@ -133,8 +133,20 @@ module ActionController #:nodoc:
         Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
         return key ? self[key] : self
       end
+  end
+
+  # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
+  # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
+  # to put a new one.
+  def flash #:doc:
+    unless @_flash
+      @_flash = session["flash"] || FlashHash.new
+      @_flash.sweep
     end
 
+    @_flash
+  end
+
   protected
     def process_action(method_name)
       super
@@ -146,17 +158,5 @@ module ActionController #:nodoc:
       super
       @_flash = nil
     end
-
-    # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
-    # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
-    # to put a new one.
-    def flash #:doc:
-      unless @_flash
-        @_flash = session["flash"] || FlashHash.new
-        @_flash.sweep
-      end
-
-      @_flash
-    end
   end
 end
-- 
cgit v1.2.3