Changeset 5792

Timestamp:

12/26/06 23:56:00 (2 years ago)

Author:

nzkoz

Message:

Allow config.to_prepare to work, make the dispatcher safe to 're require'. [Koz, Nicholas Seckar]

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/lib/dispatcher.rb (modified) (1 diff)
• trunk/railties/lib/initializer.rb (modified) (1 diff)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow config.to_prepare to work, make the dispatcher safe to 're require'. [Koz, Nicholas Seckar]
-
-* Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file.  Closes #6852 [fearoffish]

trunk/railties/lib/dispatcher.rb

@@ -164 +164 @@
-  end
-  
-
+||
-  self.preparation_callbacks_run = false
-  

trunk/railties/lib/initializer.rb

@@ -552 +552 @@
-    # See Dispatcher#to_prepare.
-    def to_prepare(&callback)
+      require 'dispatcher' unless defined?(::Dispatcher)
-      Dispatcher.to_prepare(&callback)
-    end