kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Fixed a pattern for module loading 

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@137 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2004-12-12 20:37:43 +00:00
parent 8eec674148
commit 65a9011ea3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@ -1,5 +1,7 @@
*CVS* *CVS*
* Added the possibility of marking fields as being in error without adding a message (using nil) to it that'll get displayed wth full_messages #208 [mjobin]
* Fixed Base.errors to be indifferent as to whether strings or symbols are used. Examples: * Fixed Base.errors to be indifferent as to whether strings or symbols are used. Examples:
Before: Before:

5
railties/lib/webrick_server.rb
View File

@ -130,12 +130,13 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
{ :controller => $1, :action => "index" } { :controller => $1, :action => "index" }
when %r{^/#{component}/#{component}$} then when %r{^/#{component}/#{component}$} then
{ :controller => $1, :action => $2 } { :controller => $1, :action => $2 }
when %r{^/#{component}/#{component}/#{id}$} then
{ :controller => $1, :action => $2, :id => $3 }
when %r{^/#{component}/#{component}/$} then when %r{^/#{component}/#{component}/$} then
{ :module => $1, :controller => $2, :action => "index" } { :module => $1, :controller => $2, :action => "index" }
when %r{^/#{component}/#{component}/#{component}$} then when %r{^/#{component}/#{component}/#{component}$} then
{ :module => $1, :controller => $2, :action => $3 } { :module => $1, :controller => $2, :action => $3 }
when %r{^/#{component}/#{component}/#{id}$} then
{ :controller => $1, :action => $2, :id => $3 }
when %r{^/#{component}/#{component}/#{component}/#{id}$} then when %r{^/#{component}/#{component}/#{component}/#{id}$} then
{ :module => $1, :controller => $2, :action => $3, :id => $4 } { :module => $1, :controller => $2, :action => $3, :id => $4 }
else else