diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-26 20:03:25 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-26 20:03:25 +0100 |
| commit | 4999d52e08a02ebba344f6c318f0af4b5b18f0e5 (patch) | |
| tree | f0d2af329fb961b6619ee5f2c21666168f8bb321 /railties/lib/initializer.rb | |
| parent | 40b40c487040d9c721d486e8ec8cfbc53a8cd79a (diff) | |
| download | rails-4999d52e08a02ebba344f6c318f0af4b5b18f0e5.tar.gz rails-4999d52e08a02ebba344f6c318f0af4b5b18f0e5.tar.bz2 rails-4999d52e08a02ebba344f6c318f0af4b5b18f0e5.zip | |
Added that config/routes.rb files in engine plugins are automatically loaded (and reloaded when they change in dev mode) [DHH]
Diffstat (limited to 'railties/lib/initializer.rb')
| -rw-r--r-- | railties/lib/initializer.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 038288dc88..b0abf3379c 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -486,8 +486,13 @@ Run `rake gems:install` to install the missing gems. # loading module used to lazily load controllers (Configuration#controller_paths). def initialize_routing return unless configuration.frameworks.include?(:action_controller) - ActionController::Routing.controller_paths = configuration.controller_paths - ActionController::Routing::Routes.configuration_file = configuration.routes_configuration_file + + ActionController::Routing.controller_paths = configuration.controller_paths + plugin_loader.controller_paths + + ([ configuration.routes_configuration_file ] + plugin_loader.routing_files).each do |routing_file| + ActionController::Routing::Routes.add_configuration_file(routing_file) + end + ActionController::Routing::Routes.reload end |