diff options
| -rw-r--r-- | railties/lib/initializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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) |