diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-03 22:38:27 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-03 22:38:27 -0700 |
| commit | 53bcbfbdc1eed45cc6615e59d36baf018ab43d96 (patch) | |
| tree | 691441d50ef7e49b5317ce279329bcaa1d135744 /railties/lib/rails | |
| parent | f55ad960d22337d0d92a93724f1cc3ad45200836 (diff) | |
| parent | 82e96eb294ae21528c3e05e91c05c7ee5222afbd (diff) | |
| download | rails-53bcbfbdc1eed45cc6615e59d36baf018ab43d96.tar.gz rails-53bcbfbdc1eed45cc6615e59d36baf018ab43d96.tar.bz2 rails-53bcbfbdc1eed45cc6615e59d36baf018ab43d96.zip | |
Merge branch 'master' into erbout
Diffstat (limited to 'railties/lib/rails')
| -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 1e542dd038..948d497007 100644 --- a/railties/lib/rails/plugin/loader.rb +++ b/railties/lib/rails/plugin/loader.rb @@ -45,9 +45,9 @@ module Rails plugins.each do |plugin| plugin.load_paths.each do |path| $LOAD_PATH.insert(application_lib_index + 1, path) - Dependencies.load_paths << path + ActiveSupport::Dependencies.load_paths << path unless Rails.configuration.reload_plugins? - Dependencies.load_once_paths << path + ActiveSupport::Dependencies.load_once_paths << path end end end |