diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-25 10:38:17 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-25 10:38:17 +0200 |
| commit | b72d9667070521f2b40a3b307d7e5c7c66f83385 (patch) | |
| tree | c065114f5c58ecf0594ad4a4b59483b031cda752 /railties/lib/rails/plugin/loader.rb | |
| parent | 8843b91da70d7e4a51f7337db218489a5713dc16 (diff) | |
| parent | 3aad4d7fbec6b0881733d3a9b2aff756f775ad35 (diff) | |
| download | rails-b72d9667070521f2b40a3b307d7e5c7c66f83385.tar.gz rails-b72d9667070521f2b40a3b307d7e5c7c66f83385.tar.bz2 rails-b72d9667070521f2b40a3b307d7e5c7c66f83385.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails/plugin/loader.rb')
| -rw-r--r-- | railties/lib/rails/plugin/loader.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb index bc22dfc591..7ea9c7c0f3 100644 --- a/railties/lib/rails/plugin/loader.rb +++ b/railties/lib/rails/plugin/loader.rb @@ -105,7 +105,7 @@ module Rails end def register_plugin_as_loaded(plugin) - initializer.loaded_plugins << plugin + initializer.config.loaded_plugins << plugin end def configuration @@ -174,7 +174,7 @@ module Rails end def loaded?(plugin_name) - initializer.loaded_plugins.detect { |plugin| plugin.name == plugin_name.to_s } + initializer.config.loaded_plugins.detect { |plugin| plugin.name == plugin_name.to_s } end def ensure_all_registered_plugins_are_loaded! |