diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-07-03 13:01:39 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-07-03 13:01:39 +0100 |
| commit | 2fe263bb328c20539f2970057f31e567ec4ab7c8 (patch) | |
| tree | 63e85164fb09aca6beb78e1a5c52424fa49ed098 /railties/lib/rails/plugin | |
| parent | bf5ac9965f12840d469ef2a4a16e8205dbbe5253 (diff) | |
| parent | a4bdc00fec623f72592e663e6d7830eea0bc6ea4 (diff) | |
| download | rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.tar.gz rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.tar.bz2 rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller.rb
actionpack/lib/action_controller/base/base.rb
actionpack/lib/action_view/template/path.rb
activesupport/lib/active_support/json/encoders/hash.rb
Diffstat (limited to 'railties/lib/rails/plugin')
| -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! |