Merge branch 'master' into notes

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

diff --git a/config/initializers/sanitize.rb b/config/initializers/sanitize.rb
index 7360e2701658a7f02a30c310c1955a61949033fe..0df38f0fa87339702ec4ad6425068fcf3998fa1d 100644 (file)
--- a/config/initializers/sanitize.rb
+++ b/config/initializers/sanitize.rb
@@ -1,3 +1,4 @@
 Sanitize::Config::OSM = Sanitize::Config::RELAXED.dup
 
 Sanitize::Config::OSM[:add_attributes] = { 'a' => { 'rel' => 'nofollow' } }
 Sanitize::Config::OSM = Sanitize::Config::RELAXED.dup
 
 Sanitize::Config::OSM[:add_attributes] = { 'a' => { 'rel' => 'nofollow' } }

+Sanitize::Config::OSM[:remove_contents] = [ 'script', 'style' ]