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
This commit is contained in:
parent
af081b3677
commit
620d3a3749
|
@ -1,5 +1,7 @@
|
||||||
*SVN*
|
*SVN*
|
||||||
|
|
||||||
|
* Fixed that the routes.rb file wouldn't be found on symlinked setups due to File.expand_path #793 [piotr@t-p-l.com]
|
||||||
|
|
||||||
* Fixed issues with caching root pages #734 [Nicholas Seckar]
|
* Fixed issues with caching root pages #734 [Nicholas Seckar]
|
||||||
|
|
||||||
* Changed ActiveRecordStore to use Marshal instead of YAML as the latter proved troublesome in persisting circular dependencies. Updating existing applications MUST clear their existing session table from data to start using this updated store #739 [Jamis Buck]
|
* Changed ActiveRecordStore to use Marshal instead of YAML as the latter proved troublesome in persisting circular dependencies. Updating existing applications MUST clear their existing session table from data to start using this updated store #739 [Jamis Buck]
|
||||||
|
|
|
@ -280,7 +280,7 @@ module ActionController
|
||||||
|
|
||||||
def reload
|
def reload
|
||||||
begin
|
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
|
require_dependency(route_file) if route_file
|
||||||
rescue LoadError, ScriptError => e
|
rescue LoadError, ScriptError => e
|
||||||
raise RoutingError, "Cannot load config/routes.rb:\n #{e.message}"
|
raise RoutingError, "Cannot load config/routes.rb:\n #{e.message}"
|
||||||
|
|
Loading…
Reference in New Issue