diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 23:55:07 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 23:55:07 +0000 |
| commit | 620d3a3749cf55ad9fcd9193a88da34d9c4624d4 (patch) | |
| tree | f6f08f8279fd5ed8354efdf180e2e00987939313 /actionpack/lib/action_controller | |
| parent | af081b3677dfaf53b6d045c1af9ecf2ecc8e79a1 (diff) | |
| download | rails-620d3a3749cf55ad9fcd9193a88da34d9c4624d4.tar.gz rails-620d3a3749cf55ad9fcd9193a88da34d9c4624d4.tar.bz2 rails-620d3a3749cf55ad9fcd9193a88da34d9c4624d4.zip | |
Fixed that the routes.rb file wouldn't be found on symlinked setups due to File.expand_path #793 [piotr@t-p-l.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@870 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 218697aca8..1aaa599b9e 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -280,7 +280,7 @@ module ActionController def reload begin - route_file = defined?(RAILS_ROOT) ? File.expand_path(File.join(RAILS_ROOT, 'config', 'routes')) : nil + route_file = defined?(RAILS_ROOT) ? File.join(RAILS_ROOT, 'config', 'routes') : nil require_dependency(route_file) if route_file rescue LoadError, ScriptError => e raise RoutingError, "Cannot load config/routes.rb:\n #{e.message}" |