aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-06 14:16:25 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-06 14:16:25 +0000
commit688f0f6712a37474e92f86de1046f5aa0e11030e (patch)
treee6d4d123281cd577600d80bff9ea776ef6ce3ceb /actionpack/lib/action_controller
parent6e5a7340e697e89ecab98b4c60ee346b8ed9a741 (diff)
downloadrails-688f0f6712a37474e92f86de1046f5aa0e11030e.tar.gz
rails-688f0f6712a37474e92f86de1046f5aa0e11030e.tar.bz2
rails-688f0f6712a37474e92f86de1046f5aa0e11030e.zip
Fixed that map.connect should convert arguments to strings #780 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@855 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/routing.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 894b3476e1..218697aca8 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -15,7 +15,7 @@ module ActionController
raise ArgumentError, "Regexp requirement on #{k}, but #{k} is not in this route's path!" unless @items.include? k
@requirements[k] = v
else
- (@items.include?(k) ? @defaults : @requirements)[k] = v
+ (@items.include?(k) ? @defaults : @requirements)[k] = (v.nil? ? nil : v.to_s)
end
end