From bc223236a62994737db96becd6a9e8b3579210a1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 10 Nov 2005 10:45:39 +0000 Subject: [PATCH] Don't reload routes until plugins have been loaded so they have a chance to extend the routing capabilities [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2967 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/CHANGELOG | 2 ++ railties/lib/initializer.rb | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 94ce0d71af..b16432da18 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Don't reload routes until plugins have been loaded so they have a chance to extend the routing capabilities [DHH] + * Don't detach or fork for script/server tailing [Nicholas Seckar] * Added automatic browser launching on OS X when starting script/server [DHH] diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 1535b7213f..082c14c634 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -82,7 +82,6 @@ def process initialize_logger initialize_framework_logging initialize_framework_views - initialize_routing initialize_dependency_mechanism initialize_breakpoints initialize_whiny_nils @@ -97,6 +96,9 @@ def process load_framework_info load_plugins + + # Routing must be initialized after plugins to allow the former to extend the routes + initialize_routing end # Set the $LOAD_PATH based on the value of -- GitLab