aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-21 18:14:32 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-21 18:14:32 -0700
commitb99442933d9a4ffa7793d2cb2f73b2e9f22d2605 (patch)
tree0e1c0804c82340a3ee3bbce0edd95e34733fa68d /actionpack/lib/action_controller
parentf8f077945f4d108d676384106a9dfcf5c6f7a33d (diff)
downloadrails-b99442933d9a4ffa7793d2cb2f73b2e9f22d2605.tar.gz
rails-b99442933d9a4ffa7793d2cb2f73b2e9f22d2605.tar.bz2
rails-b99442933d9a4ffa7793d2cb2f73b2e9f22d2605.zip
deprecate Base#assign_default_content_type_and_charset
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index ea7d336640..082f09ff16 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1218,6 +1218,11 @@ module ActionController #:nodoc:
@action_name = (params['action'] || 'index')
end
+ def assign_default_content_type_and_charset
+ response.assign_default_content_type_and_charset!
+ end
+ deprecate :assign_default_content_type_and_charset => :'response.assign_default_content_type_and_charset!'
+
def action_methods
self.class.action_methods
end