aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorCheah Chu Yeow <chuyeow@gmail.com>2008-05-04 23:54:08 +0800
committerrick <rick@spacemonkey.local>2008-05-05 23:41:33 -0700
commitee1d508a6bbdbfafb20516ebb4b452f1596f9ebe (patch)
tree4bc2991c6819f50de9b44201033751baf9e27434 /actionpack/lib/action_controller/base.rb
parent04d85548608eb42f2d7071daa4661c5eac3a552a (diff)
downloadrails-ee1d508a6bbdbfafb20516ebb4b452f1596f9ebe.tar.gz
rails-ee1d508a6bbdbfafb20516ebb4b452f1596f9ebe.tar.bz2
rails-ee1d508a6bbdbfafb20516ebb4b452f1596f9ebe.zip
Allow ActionController::Base#default_url_options to have a default options argument of nil.
This fixes a bug introduced in [6a6b4392c16c665eb713705f2b38e959a658eeef] which was breaking routing in ActionController::UrlWriter.
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rwxr-xr-xactionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 6b5914c4dd..c6d28b492a 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -998,7 +998,7 @@ module ActionController #:nodoc:
# As you can infer from the example, this is mostly useful for situations where you want to centralize dynamic decisions about the
# urls as they stem from the business domain. Please note that any individual url_for call can always override the defaults set
# by this method.
- def default_url_options(options) #:doc:
+ def default_url_options(options = nil)
end
# Redirects the browser to the target specified in +options+. This parameter can take one of three forms: