From 199e750d46c04970b5e7684998d09405648ecbd4 Mon Sep 17 00:00:00 2001 From: Andrew White Date: Tue, 10 Feb 2009 12:09:49 -0600 Subject: Fix some edge cases when the same template is called with different local assigns Signed-off-by: Joshua Peek --- railties/lib/initializer.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'railties/lib') 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 -- cgit v1.2.3