mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Fixed that RAILS_ROOT might not be defined when AP was loaded, so do a late initialization of the ROUTE_FILE #761 [Scott Barron]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@822 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -1,5 +1,11 @@
|
||||
*SVN*
|
||||
|
||||
* Fixed that RAILS_ROOT might not be defined when AP was loaded, so do a late initialization of the ROUTE_FILE #761 [Scott Barron]
|
||||
|
||||
* Fix request.path_info and clear up LoadingModule behavior #754 [Nicholas Seckar]
|
||||
|
||||
* Fixed caching to be aware of extensions (so you can cache files like api.wsdl or logo.png) #734 [Nicholas Seckar]
|
||||
|
||||
* Fixed that Routes would raise NameErrors if a controller component contains characters that are not valid constant names #733 [Nicholas Seckar]
|
||||
|
||||
* Added PATH_INFO access from the request that allows urls like the following to be interpreted by rails: http://www.example.com/dispatcher.cgi/controller/action -- that makes it possible to use rails as a CGI under lighttpd and would also allow (for example) Rublog to be ported to rails without breaking existing links to Rublog-powered blogs. #728 [Jamis Buck]
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
module ActionController
|
||||
# See http://manuals.rubyonrails.com/read/chapter/65
|
||||
module Routing
|
||||
ROUTE_FILE = defined?(RAILS_ROOT) ? File.expand_path(File.join(RAILS_ROOT, 'config', 'routes')) : nil
|
||||
|
||||
class Route #:nodoc:
|
||||
attr_reader :defaults # The defaults hash
|
||||
|
||||
@@ -282,7 +280,8 @@ module ActionController
|
||||
|
||||
def reload
|
||||
begin
|
||||
require_dependency(ROUTE_FILE) if ROUTE_FILE
|
||||
route_file = defined?(RAILS_ROOT) ? File.expand_path(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}"
|
||||
ensure # Ensure that there is at least one route:
|
||||
|
||||
Reference in New Issue
Block a user