aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-08-31 10:45:59 -0500
committerJoshua Peek <josh@joshpeek.com>2008-08-31 10:50:43 -0500
commit8eec694598978ec054d8fc8daf2ee704baf794fe (patch)
tree49e9aca34651fbfab9385f4f18a29cab52b90053 /actionpack/lib/action_controller
parent56c2b02f592aa7c127346f2c68ac45236c27702e (diff)
downloadrails-8eec694598978ec054d8fc8daf2ee704baf794fe.tar.gz
rails-8eec694598978ec054d8fc8daf2ee704baf794fe.tar.bz2
rails-8eec694598978ec054d8fc8daf2ee704baf794fe.zip
Prefix ActionView::Base private methods with an underscore
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb2
-rw-r--r--actionpack/lib/action_controller/test_process.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index f527b131d8..172bf7363f 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -917,7 +917,7 @@ module ActionController #:nodoc:
end
elsif options[:update]
- @template.send! :evaluate_assigns_and_ivars
+ @template.send(:_evaluate_assigns_and_ivars)
generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(@template, &block)
response.content_type = Mime::JS
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 1d0254b522..4065e9db6a 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -218,7 +218,7 @@ module ActionController #:nodoc:
# Returns the template of the file which was used to
# render this response (or nil)
def rendered_template
- template._first_render
+ template.send(:_first_render)
end
# A shortcut to the flash. Returns an empty hash if no session flash exists.