diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-04-26 06:11:00 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-04-26 06:11:00 -0700 |
| commit | 8cd14c0bc9f9429f03d1181912355d2f48b98157 (patch) | |
| tree | 69f3b385b3aaac6f67b06b96a8a5edffd841e586 /activerecord/lib | |
| parent | 2f0c8c52e66f1a2a3d1c00efc207f227124e96c2 (diff) | |
| parent | 627f89b189734d7c8915a74f3f57a232d3d4d0d9 (diff) | |
| download | rails-8cd14c0bc9f9429f03d1181912355d2f48b98157.tar.gz rails-8cd14c0bc9f9429f03d1181912355d2f48b98157.tar.bz2 rails-8cd14c0bc9f9429f03d1181912355d2f48b98157.zip | |
Merge pull request #5995 from kennyj/fix_5847-3
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 |