diff options
| author | Michael Koziarski <michael@koziarski.com> | 2006-01-13 09:40:05 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2006-01-13 09:40:05 +0000 |
| commit | 35c50bf93822d8af19b9bc1959a38a1bb8af67b7 (patch) | |
| tree | 1f8d74ac4c58555f9512bfe3984c443e306233f8 | |
| parent | 30c6bd9b31098332d6357d3ab614941646cbe0e2 (diff) | |
| download | rails-35c50bf93822d8af19b9bc1959a38a1bb8af67b7.tar.gz rails-35c50bf93822d8af19b9bc1959a38a1bb8af67b7.tar.bz2 rails-35c50bf93822d8af19b9bc1959a38a1bb8af67b7.zip | |
Fix problems with the plugin loader where plugins could override 'name' and prevent loading. Closes #3297
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3414 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index eae7083fdd..3dff1ce5ba 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Corrected problems with plugin loader where plugins set 'name' incorrectly #3297 [anna@wota.jp] + * Make migration generator only report on exact duplicate names, not partial dupliate names. #3442 [jeremy@planetargon.com Marcel Molina Jr.] * Fix typo in mailer generator USAGE. #3458 [chriztian.steinmeier@gmail.com] diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index d8b951b284..a7230f5cf7 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -310,12 +310,13 @@ module Rails # Allow plugins to reference the current configuration object config = configuration + + # Add to set of loaded plugins before 'name' collapsed in eval. + loaded_plugins << name # Evaluate init.rb. silence_warnings { eval(IO.read(init_path), binding, init_path) } if has_init - # Add to set of loaded plugins. - loaded_plugins << name true end end |