From 30baaac5465a352e78dac6330407a7b3460db180 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 19 Jun 2009 11:41:02 -0700
Subject: Fix the default frameworks

---
 railties/lib/initializer.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 3adc3b9ce5..37bec7a272 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -1,4 +1,8 @@
 require "pathname"
+require 'railties_path'
+require 'rails/version'
+require 'rails/gem_dependency'
+require 'rails/rack'
 
 module Rails
   class Configuration
@@ -12,9 +16,9 @@ module Rails
       @framework_paths         = []
       @load_once_paths         = []
       @after_initialize_blocks = []
-      @frameworks              = []
       @plugin_paths            = []
       @loaded_plugins          = []
+      @frameworks              = default_frameworks
       @plugin_loader           = default_plugin_loader
       @plugin_locators         = default_plugin_locators
       @gems                    = default_gems
@@ -46,6 +50,10 @@ module Rails
       ActionController::Dispatcher.middleware
     end
 
+    def default_frameworks
+      [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ]
+    end
+
     def default_plugin_loader
       require 'rails/plugin/loader'
       Plugin::Loader
-- 
cgit v1.2.3