diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-01 03:58:37 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-01 03:58:37 +0000 |
| commit | 26761d6d323a3f4071bdc009058fb213e9c87718 (patch) | |
| tree | f4b0ddb7e0880a8f5df9e6ca68bf32164a88712b /actionpack/lib/action_controller | |
| parent | e398045774aa33ef130e3b28c86a4e413f641383 (diff) | |
| download | rails-26761d6d323a3f4071bdc009058fb213e9c87718.tar.gz rails-26761d6d323a3f4071bdc009058fb213e9c87718.tar.bz2 rails-26761d6d323a3f4071bdc009058fb213e9c87718.zip | |
If included_modules doesnt take a parameter, we shouldnt either
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3509 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/session/active_record_store.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 6751e2b3e8..3f54e5d383 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -522,7 +522,7 @@ module ActionController #:nodoc: attr_accessor :controller # ActiveRecord::Observer will mark this class as reloadable even though it should be - def self.included_modules(include_super = true) + def self.included_modules super() - [ Reloadable ] end diff --git a/actionpack/lib/action_controller/session/active_record_store.rb b/actionpack/lib/action_controller/session/active_record_store.rb index 2a9a269adb..02384021d8 100644 --- a/actionpack/lib/action_controller/session/active_record_store.rb +++ b/actionpack/lib/action_controller/session/active_record_store.rb @@ -66,7 +66,7 @@ class CGI class << self # Don't try to reload ARStore::Session in dev mode. - def included_modules(include_super = true) + def included_modules super() - [ Reloadable ] end |