Merge branch 'master' into moderation

[rails.git] / config / initializers / sanitize.rb

diff --git a/config/initializers/sanitize.rb b/config/initializers/sanitize.rb
index 0df38f0fa87339702ec4ad6425068fcf3998fa1d..240f1e315e404a24665f92d77c5e30e2b78bc195 100644 (file)
--- a/config/initializers/sanitize.rb
+++ b/config/initializers/sanitize.rb
@@ -1,4 +1,5 @@
 Sanitize::Config::OSM = Sanitize::Config::RELAXED.dup
 
-Sanitize::Config::OSM[:add_attributes] = { 'a' => { 'rel' => 'nofollow' } }
-Sanitize::Config::OSM[:remove_contents] = [ 'script', 'style' ]
+Sanitize::Config::OSM[:elements] -= %w[div style]
+Sanitize::Config::OSM[:add_attributes] = { "a" => { "rel" => "nofollow" } }
+Sanitize::Config::OSM[:remove_contents] = %w[script style]