kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Deprecate usage of ActionView::Template::Handlers::ERB::escape_whitelist

Browse source
This commit is contained in:
Kevin Deisz 2018-08-24 16:13:57 -04:00
parent 1b98de8030
commit cac2bb7f44
No known key found for this signature in database
GPG key ID: D78C2D8FB232C59C
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
actionview/lib/action_view/template/handlers/erb.rb
View file

@ -14,7 +14,17 @@ module ActionView
class_attribute :erb_implementation, default: Erubi class_attribute :erb_implementation, default: Erubi
# Do not escape templates of these mime types. # Do not escape templates of these mime types.
class_attribute :escape_whitelist, default: ["text/plain"] class_attribute :escape_permit_list, default: ["text/plain"]
[self, singleton_class].each do |base|
base.alias_method :escape_whitelist, :escape_permit_list
base.alias_method :escape_whitelist=, :escape_permit_list=
base.deprecate(
escape_whitelist: 'use #escape_permit_list instead',
:escape_whitelist= => 'use #escape_permit_list= instead'
)
end
ENCODING_TAG = Regexp.new("\\A(<%#{ENCODING_FLAG}-?%>)[ \\t]*") ENCODING_TAG = Regexp.new("\\A(<%#{ENCODING_FLAG}-?%>)[ \\t]*")
@ -47,7 +57,7 @@ module ActionView
self.class.erb_implementation.new( self.class.erb_implementation.new(
erb, erb,
escape: (self.class.escape_whitelist.include? template.type), escape: (self.class.escape_permit_list.include? template.type),
trim: (self.class.erb_trim_mode == "-") trim: (self.class.erb_trim_mode == "-")
).src ).src
end end