1 files changed, 17 insertions, 0 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 8a5ca6f91b..b5bf9266f5 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -38,6 +38,14 @@ module Rails
     def cache
       RAILS_CACHE
     end
+
+    def public_path
+      @@public_path ||= File.join(self.root, "public")
+    end
+
+    def public_path=(path)
+      @@public_path = path
+    end
   end
   
   # The Initializer is responsible for processing the Rails configuration, such
@@ -127,6 +135,9 @@ module Rails
 
       load_application_initializers
 
+      # Prepare dispatcher callbacks and run 'prepare' callbacks
+      prepare_dispatcher
+
       # the framework is now fully initialized
       after_initialize
 
@@ -434,6 +445,12 @@ module Rails
       end
     end
 
+    def prepare_dispatcher
+      require 'dispatcher' unless defined?(::Dispatcher)
+      Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
+      Dispatcher.new(RAILS_DEFAULT_LOGGER).send :run_callbacks, :prepare_dispatch
+    end
+
   end
 
   # The Configuration class holds all the parameters for the Initializer and