aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-17 09:29:00 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-17 18:07:08 -0200
commit57be2cfa1eb5cf04c86f4ab5461f6903df099b98 (patch)
treeed65285b2941850cf0373dc8969111a5bd627c04 /actionpack/lib
parent20baeece919629b7e43b86aebb05f8e2af6d19ef (diff)
downloadrails-57be2cfa1eb5cf04c86f4ab5461f6903df099b98.tar.gz
rails-57be2cfa1eb5cf04c86f4ab5461f6903df099b98.tar.bz2
rails-57be2cfa1eb5cf04c86f4ab5461f6903df099b98.zip
Deprecate default_charset= at controller level
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 76292db0b3..21626fde44 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -16,8 +16,10 @@ module ActionController
# should be able to handle SCRIPT_NAME
self.config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
- class << self
- delegate :default_charset=, :to => "ActionDispatch::Response"
+ def self.default_charset=(new_charset)
+ ActiveSupport::Deprecation.warn "Setting default charset at controller level" \
+ " is deprecated, please use `config.action_dispatch.default_charset` instead", caller
+ ActionDispatch::Response.default_charset = new_charset
end
self.protected_instance_variables = %w(