diff options
| author | calavera <david.calavera@gmail.com> | 2009-05-27 14:56:14 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-27 14:56:14 -0500 |
| commit | 0d9e904da35b41c8796b026d63675d4733505c91 (patch) | |
| tree | 40cdd112d7dcb60fbbd023ba49284141f9884207 /railties/lib | |
| parent | 6ef329d3250cfc3a21184cc2a8248aa18a1f6815 (diff) | |
| download | rails-0d9e904da35b41c8796b026d63675d4733505c91.tar.gz rails-0d9e904da35b41c8796b026d63675d4733505c91.tar.bz2 rails-0d9e904da35b41c8796b026d63675d4733505c91.zip | |
ensure initialize_database_middleware doesn't use ActionController if action_controller framework is not enabled [#2680 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/initializer.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 3c0d5940ea..7ae766f913 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -445,7 +445,8 @@ Run `rake gems:install` to install the missing gems. def initialize_database_middleware if configuration.frameworks.include?(:active_record) - if ActionController::Base.session_store == ActiveRecord::SessionStore + if configuration.frameworks.include?(:action_controller) && + ActionController::Base.session_store == ActiveRecord::SessionStore configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache else @@ -886,7 +887,7 @@ Run `rake gems:install` to install the missing gems. # Enable threaded mode. Allows concurrent requests to controller actions and # multiple database connections. Also disables automatic dependency loading - # after boot, and disables reloading code on every request, as these are + # after boot, and disables reloading code on every request, as these are # fundamentally incompatible with thread safety. def threadsafe! self.preload_frameworks = true @@ -1129,3 +1130,4 @@ class Rails::OrderedOptions < Array #:nodoc: return false end end + |