diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-27 18:59:24 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-27 18:59:24 +0100 |
| commit | f2ee056873b84f8917e72d87181e1a9f5f653342 (patch) | |
| tree | 47c47835a9f34d065b85f3d1d68f9e21e78649f4 /railties/lib/initializer.rb | |
| parent | 229f959d15e451890db60dbb73f8565079977814 (diff) | |
| download | rails-f2ee056873b84f8917e72d87181e1a9f5f653342.tar.gz rails-f2ee056873b84f8917e72d87181e1a9f5f653342.tar.bz2 rails-f2ee056873b84f8917e72d87181e1a9f5f653342.zip | |
Added view path support for engines [DHH]
Diffstat (limited to 'railties/lib/initializer.rb')
| -rw-r--r-- | railties/lib/initializer.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index b0abf3379c..0c06d1bf21 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -487,12 +487,8 @@ Run `rake gems:install` to install the missing gems. def initialize_routing return unless configuration.frameworks.include?(:action_controller) - 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.controller_paths += configuration.controller_paths + ActionController::Routing::Routes.add_configuration_file(configuration.routes_configuration_file) ActionController::Routing::Routes.reload end |