diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-28 00:57:47 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-06-28 01:22:32 +0200 |
| commit | 9b19a6f16cebf4257d2f0b839f6cc8ff5db5c47b (patch) | |
| tree | 98028044107a83c44f658e077a587c65d27d31b3 /railties/lib/rails/engine | |
| parent | 4329f8133fee8e4f3e558787f67de59f0c4a4dd1 (diff) | |
| download | rails-9b19a6f16cebf4257d2f0b839f6cc8ff5db5c47b.tar.gz rails-9b19a6f16cebf4257d2f0b839f6cc8ff5db5c47b.tar.bz2 rails-9b19a6f16cebf4257d2f0b839f6cc8ff5db5c47b.zip | |
A few changes were done in this commit:
* Added :autoload to engines path API and redefine usage to be in sync with 6f83a5036d8a9c3f8ed7;
* Do not autoload code in *lib* for applications (now you need to explicitly require them). This makes an application behave closer to an engine (code in lib is still autoloaded for plugins);
* Always autoload code in app/ for engines and plugins. This makes engines behave closer to an application and should allow us to get rid of the unloadable hack required when controllers inside engines inherit from ApplicationController;
Diffstat (limited to 'railties/lib/rails/engine')
| -rw-r--r-- | railties/lib/rails/engine/configuration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index 4e27180f1e..2f465670cf 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -42,11 +42,11 @@ module Rails end def autoload_once_paths - @autoload_once_paths ||= paths.load_once + @autoload_once_paths ||= paths.autoload_once end def autoload_paths - @autoload_paths ||= paths.load_paths + @autoload_paths ||= paths.autoload_paths end end end |