diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-05 23:05:41 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-05 23:05:41 -0800 |
| commit | 34f34e300980dfef0b8a8d4515ef84ce1f168417 (patch) | |
| tree | deb3d4895488366d66811c4c2b6b9bc0359b5bcb /railties/lib/initializer.rb | |
| parent | 6f8ed1cd3fa595a59d7a19d8d383836b456ac803 (diff) | |
| parent | be098f840614bbb71fe26f0e2b4c064b6866c076 (diff) | |
| download | rails-34f34e300980dfef0b8a8d4515ef84ce1f168417.tar.gz rails-34f34e300980dfef0b8a8d4515ef84ce1f168417.tar.bz2 rails-34f34e300980dfef0b8a8d4515ef84ce1f168417.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/initializer.rb')
| -rw-r--r-- | railties/lib/initializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index da064c86aa..e3811dd8be 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -132,10 +132,10 @@ module Rails add_gem_load_paths require_frameworks - preload_frameworks set_autoload_paths add_plugin_load_paths load_environment + preload_frameworks initialize_encoding initialize_database @@ -270,7 +270,7 @@ module Rails configuration.frameworks.each do |framework| # String#classify and #constantize aren't available yet. toplevel = Object.const_get(framework.to_s.gsub(/(?:^|_)(.)/) { $1.upcase }) - toplevel.load_all! + toplevel.load_all! if toplevel.respond_to?(:load_all!) end end end |