diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-02 05:32:14 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-02 05:32:14 +0000 |
| commit | 0ee1cb2cd32bfaf47deaf5440dd5b9cf0915ab6a (patch) | |
| tree | 5778378eafcbdfa37c82c67be1566c76aca249be /actionpack/lib/action_controller/flash.rb | |
| parent | 9264bdc8f618344307f07790a07a60dc04b80434 (diff) | |
| download | rails-0ee1cb2cd32bfaf47deaf5440dd5b9cf0915ab6a.tar.gz rails-0ee1cb2cd32bfaf47deaf5440dd5b9cf0915ab6a.tar.bz2 rails-0ee1cb2cd32bfaf47deaf5440dd5b9cf0915ab6a.zip | |
Ruby 1.9 compat, consistent load paths
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7719 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/flash.rb')
| -rw-r--r-- | actionpack/lib/action_controller/flash.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb index b3e39912ce..692168f230 100644 --- a/actionpack/lib/action_controller/flash.rb +++ b/actionpack/lib/action_controller/flash.rb @@ -25,9 +25,8 @@ module ActionController #:nodoc: # See docs on the FlashHash class for more details about the flash. module Flash def self.included(base) - base.send :include, InstanceMethods - base.class_eval do + include InstanceMethods alias_method_chain :assign_shortcuts, :flash alias_method_chain :process_cleanup, :flash alias_method_chain :reset_session, :flash @@ -175,4 +174,4 @@ module ActionController #:nodoc: end end end -end
\ No newline at end of file +end |