aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-04-16 16:08:29 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-04-16 16:08:29 +0000
commit6ee06ebec6814576b16f6438c89fb53d557305c2 (patch)
tree8119a05e75fa1b86485d05debeb0606970dadb93 /actionpack/lib/action_controller
parent82456d9392e4abc0a402294c32089b646975eed4 (diff)
downloadrails-6ee06ebec6814576b16f6438c89fb53d557305c2.tar.gz
rails-6ee06ebec6814576b16f6438c89fb53d557305c2.tar.bz2
rails-6ee06ebec6814576b16f6438c89fb53d557305c2.zip
Changed render_partial to take local assigns as the second parameter instead of an explicit object and then the assigns
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1170 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/base.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index e7020421c5..c8a012afda 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -242,7 +242,7 @@ module ActionController #:nodoc:
cattr_accessor :ignore_missing_templates
# Holds the request object that's primarily used to get environment variables through access like
- # <tt>@request.env["REQUEST_URI"]</tt>.
+ # <tt>request.env["REQUEST_URI"]</tt>.
attr_accessor :request
# Holds a hash of all the GET, POST, and Url parameters passed to the action. Accessed like <tt>@params["post_id"]</tt>
@@ -250,16 +250,16 @@ module ActionController #:nodoc:
attr_accessor :params
# Holds the response object that's primarily used to set additional HTTP headers through access like
- # <tt>@response.headers["Cache-Control"] = "no-cache"</tt>. Can also be used to access the final body HTML after a template
- # has been rendered through @response.body -- useful for <tt>after_filter</tt>s that wants to manipulate the output,
+ # <tt>response.headers["Cache-Control"] = "no-cache"</tt>. Can also be used to access the final body HTML after a template
+ # has been rendered through response.body -- useful for <tt>after_filter</tt>s that wants to manipulate the output,
# such as a OutputCompressionFilter.
attr_accessor :response
- # Holds a hash of objects in the session. Accessed like <tt>@session["person"]</tt> to get the object tied to the "person"
+ # Holds a hash of objects in the session. Accessed like <tt>session[:person]</tt> to get the object tied to the "person"
# key. The session will hold any type of object as values, but the key should be a string.
attr_accessor :session
- # Holds a hash of header names and values. Accessed like <tt>@headers["Cache-Control"]</tt> to get the value of the Cache-Control
+ # Holds a hash of header names and values. Accessed like <tt>headers["Cache-Control"]</tt> to get the value of the Cache-Control
# directive. Values should always be specified as strings.
attr_accessor :headers