diff options
| author | Michael Koziarski <michael@koziarski.com> | 2006-02-01 03:54:37 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2006-02-01 03:54:37 +0000 |
| commit | e398045774aa33ef130e3b28c86a4e413f641383 (patch) | |
| tree | 10dac725445af722c23c8fec20c8955067f0c105 | |
| parent | 59d29811c5b5684fc5f24fb9ac31e405e0873aab (diff) | |
| download | rails-e398045774aa33ef130e3b28c86a4e413f641383.tar.gz rails-e398045774aa33ef130e3b28c86a4e413f641383.tar.bz2 rails-e398045774aa33ef130e3b28c86a4e413f641383.zip | |
Fix Syntax problems which were preventing webrick from starting
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3508 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -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 099df53cf6..6751e2b3e8 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -523,7 +523,7 @@ module ActionController #:nodoc: # ActiveRecord::Observer will mark this class as reloadable even though it should be def self.included_modules(include_super = true) - super - [ Reloadable ] + super() - [ Reloadable ] end def before(controller) diff --git a/actionpack/lib/action_controller/session/active_record_store.rb b/actionpack/lib/action_controller/session/active_record_store.rb index 111d77ed3b..2a9a269adb 100644 --- a/actionpack/lib/action_controller/session/active_record_store.rb +++ b/actionpack/lib/action_controller/session/active_record_store.rb @@ -67,7 +67,7 @@ class CGI class << self # Don't try to reload ARStore::Session in dev mode. def included_modules(include_super = true) - super - [ Reloadable ] + super() - [ Reloadable ] end # Don't try to reload ARStore::Session in dev mode. |