diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-05-14 19:03:14 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-05-14 19:03:14 +0000 |
| commit | 6ef5b747b3d7cfb156ae619b9ba6ec3ea693bf30 (patch) | |
| tree | 07f22ca750f22068950d31cf8c832b10d9eb031e | |
| parent | 9c5591da2dd9404ac189690ad59670ec7d364b16 (diff) | |
| download | rails-6ef5b747b3d7cfb156ae619b9ba6ec3ea693bf30.tar.gz rails-6ef5b747b3d7cfb156ae619b9ba6ec3ea693bf30.tar.bz2 rails-6ef5b747b3d7cfb156ae619b9ba6ec3ea693bf30.zip | |
Fix flip flopped logic in docs for url_for's :only_path option. Closes #4998. [esad@esse.at]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4341 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index ef63a8a105..7eb69f4fbd 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix flip flopped logic in docs for url_for's :only_path option. Closes #4998. [esad@esse.at] + * form.text_area handles the :size option just like the original text_area (:size => '60x10' becomes cols="60" rows="10"). [Jeremy Kemper] * Excise ingrown code from FormOptionsHelper#options_for_select. #5008 [anonymous] diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index f0997e3f6a..475144f539 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -421,7 +421,7 @@ module ActionController #:nodoc: # * <tt>:anchor</tt> -- specifies the anchor name to be appended to the path. For example, # <tt>url_for :controller => 'posts', :action => 'show', :id => 10, :anchor => 'comments'</tt> # will produce "/posts/show/10#comments". - # * <tt>:only_path</tt> -- if true, returns the absolute URL (omitting the protocol, host name, and port) + # * <tt>:only_path</tt> -- if true, returns the relative URL (omitting the protocol, host name, and port) (<tt>false</tt> by default) # * <tt>:trailing_slash</tt> -- if true, adds a trailing slash, as in "/archive/2005/". Note that this # is currently not recommended since it breaks caching. # * <tt>:host</tt> -- overrides the default (current) host if provided |