diff options
| author | kennyj <kennyj@gmail.com> | 2012-04-26 21:21:02 +0900 |
|---|---|---|
| committer | kennyj <kennyj@gmail.com> | 2012-04-26 21:21:02 +0900 |
| commit | 627f89b189734d7c8915a74f3f57a232d3d4d0d9 (patch) | |
| tree | f54f616b29e36ec6c00cf519aa893432a44f7345 /activerecord/lib | |
| parent | 848276dfba42f996a01e720a252e5fee83a4b6c2 (diff) | |
| download | rails-627f89b189734d7c8915a74f3f57a232d3d4d0d9.tar.gz rails-627f89b189734d7c8915a74f3f57a232d3d4d0d9.tar.bz2 rails-627f89b189734d7c8915a74f3f57a232d3d4d0d9.zip | |
Fix #5847 and #4045. Load AR::Base before loading an application model.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index eb2769f1ef..db0102700b 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -128,5 +128,10 @@ module ActiveRecord end end + + config.after_initialize do + # We should load ActiveRecord::Base class before loading an application model. + require "active_record/base" + end end end |