diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-05-06 20:53:56 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-05-06 20:53:56 +1200 |
| commit | a08004a9a7d4c93c39f9693f6406ecb70d6a38c0 (patch) | |
| tree | 531584bf588a3b288ab14a8e16540ab947a0ec45 /actionpack/lib/action_controller/base.rb | |
| parent | c26d10563eaa29961ae895a9fbe3afae7d24a9b1 (diff) | |
| parent | 04f52219f11944e50555dc59917c73c99581dac0 (diff) | |
| download | rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.tar.gz rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.tar.bz2 rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
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: |