diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2009-02-10 12:09:49 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-02-10 12:09:49 -0600 |
| commit | 199e750d46c04970b5e7684998d09405648ecbd4 (patch) | |
| tree | 97f847ba98946ac2da003831042966afb1017268 /railties | |
| parent | 1dab1d380377f1a2a60da43bc22989d55632d246 (diff) | |
| download | rails-199e750d46c04970b5e7684998d09405648ecbd4.tar.gz rails-199e750d46c04970b5e7684998d09405648ecbd4.tar.bz2 rails-199e750d46c04970b5e7684998d09405648ecbd4.zip | |
Fix some edge cases when the same template is called with different local assigns
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/initializer.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 39140065b0..c4c55a97eb 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -369,10 +369,8 @@ Run `rake gems:install` to install the missing gems. def load_view_paths if configuration.frameworks.include?(:action_view) - if configuration.cache_classes - ActionController::Base.view_paths = configuration.view_path if configuration.frameworks.include?(:action_controller) - ActionMailer::Base.template_root = configuration.view_path if configuration.frameworks.include?(:action_mailer) - end + ActionController::Base.view_paths.each { |path| path.load! } if configuration.frameworks.include?(:action_controller) + ActionMailer::Base.template_root.load! if configuration.frameworks.include?(:action_mailer) end end |