Load view path cache after plugins and gems.

1 files changed, 10 insertions, 3 deletions

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 828d688475..97bb81a3c8 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -168,6 +168,9 @@ module Rails
       # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
       load_observers
 
+      # Load view path cache
+      load_view_paths
+
       # load application classes
       load_application_classes
 
@@ -333,6 +336,12 @@ Run `rake gems:install` to install the missing gems.
       end
     end
 
+    def load_view_paths
+      ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes
+      ActionMailer::Base.template_root.load
+      ActionController::Base.view_paths.load
+    end
+
     # Eager load application classes
     def load_application_classes
       if configuration.cache_classes
@@ -428,9 +437,7 @@ Run `rake gems:install` to install the missing gems.
     # paths have already been set, it is not changed, otherwise it is
     # set to use Configuration#view_path.
     def initialize_framework_views
-      ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes
-      view_path = ActionView::PathSet::Path.new(configuration.view_path)
-
+      view_path = ActionView::PathSet::Path.new(configuration.view_path, false)
       ActionMailer::Base.template_root ||= view_path if configuration.frameworks.include?(:action_mailer)
       ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.empty?
     end