aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/flash.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-13 06:24:07 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-13 06:24:07 -0700
commitca50043a7ad95825b3830d97294b14b665a7d698 (patch)
tree2e663f4cd2ff552bf5202996a770f2b09efcfe46 /actionpack/lib/action_controller/metal/flash.rb
parent0729cc8ef840cf54dc424e6e3c2b50e8a23e22ed (diff)
parent1413ee991ccfc76b24f29eb03c9cff82e588e5d7 (diff)
downloadrails-ca50043a7ad95825b3830d97294b14b665a7d698.tar.gz
rails-ca50043a7ad95825b3830d97294b14b665a7d698.tar.bz2
rails-ca50043a7ad95825b3830d97294b14b665a7d698.zip
Merge pull request #12222 from rcillo/fix-custom-flash
Custom flash should be defined only for the class that defines it and it's subclasses Fixes #12057
Diffstat (limited to 'actionpack/lib/action_controller/metal/flash.rb')
-rw-r--r--actionpack/lib/action_controller/metal/flash.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb
index 1d77e331f8..65351284b9 100644
--- a/actionpack/lib/action_controller/metal/flash.rb
+++ b/actionpack/lib/action_controller/metal/flash.rb
@@ -37,7 +37,7 @@ module ActionController #:nodoc:
end
helper_method type
- _flash_types << type
+ self._flash_types += [type]
end
end
end