From 38e5d21bc4078a73bf3f90e54e8df046f92e15b3 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Sun, 4 Feb 2007 22:56:36 +0000 Subject: Fix Rails::Initializer since #view_paths is never nil git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6127 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/initializer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 81cd783a6c..a3ab73fd51 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -273,8 +273,8 @@ module Rails # paths have already been set, it is not changed, otherwise it is # set to use Configuration#view_path. def initialize_framework_views - ActionMailer::Base.template_root ||= configuration.view_path if configuration.frameworks.include?(:action_mailer) - 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) + ActionController::Base.view_paths = [configuration.view_path] if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.empty? end # If ActionController is not one of the loaded frameworks (Configuration#frameworks) -- cgit v1.2.3