diff options
| author | Cheah Chu Yeow <chuyeow@gmail.com> | 2008-05-04 23:54:08 +0800 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-05 23:41:33 -0700 |
| commit | ee1d508a6bbdbfafb20516ebb4b452f1596f9ebe (patch) | |
| tree | 4bc2991c6819f50de9b44201033751baf9e27434 /actionpack/test | |
| parent | 04d85548608eb42f2d7071daa4661c5eac3a552a (diff) | |
| download | rails-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/test')
| -rw-r--r-- | actionpack/test/controller/base_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb index 8416754c1e..ea63eda306 100644 --- a/actionpack/test/controller/base_test.rb +++ b/actionpack/test/controller/base_test.rb @@ -52,7 +52,7 @@ class DefaultUrlOptionsController < ActionController::Base def default_url_options_action end - def default_url_options(options) + def default_url_options(options = nil) { :host => 'www.override.com', :action => 'new', :bacon => 'chunky' } end end |