Ensure ActionView::TemplateFinder view cache is rebuilt on initialize.

rails · Jun 9, 2008 · df44df9 · df44df9
1 parent 0c9281e
commit df44df9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *Edge*
 
+* Ensure ActionView::TemplateFinder view cache is rebuilt on initialize [Josh Peek]
+
 * Drop ActionController::Base.allow_concurrency flag [Josh Peek]
 
 * More efficient concat and capture helpers. Remove ActionView::Base.erb_variable.  [Jeremy Kemper]

diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb
@@ -10,6 +10,10 @@ def define_dispatcher_callbacks(cache_classes)
           # Development mode callbacks
           before_dispatch :reload_application
           after_dispatch :cleanup_application
+
+          to_prepare :reload_view_path_cache do
+            ActionView::TemplateFinder.reload! unless ActionView::Base.cache_template_loading
+          end
         end
 
         # Common callbacks
@@ -134,7 +138,6 @@ def reload_application
       run_callbacks :prepare_dispatch
 
       Routing::Routes.reload
-      ActionView::TemplateFinder.reload! unless ActionView::Base.cache_template_loading
     end
 
     # Cleanup the application by clearing out loaded classes so they can