Remove style tags from html body (#15716).

git-svn-id: http://svn.redmine.org/redmine/trunk@14315 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 16 insertions, 6 deletions

diff --git a/lib/redmine/wiki_formatting/html_parser.rb b/lib/redmine/wiki_formatting/html_parser.rb
index 9d83497bd..a81d9d9e7 100644
--- a/lib/redmine/wiki_formatting/html_parser.rb
+++ b/lib/redmine/wiki_formatting/html_parser.rb
@@ -23,7 +23,8 @@ module Redmine
 
       class_attribute :tags
       self.tags = {
-        'br' => {:post => "\n"}
+        'br' => {:post => "\n"},
+        'style' => ''
       }
 
       def self.to_text(html)
@@ -44,9 +45,16 @@ module Redmine
     
         def scrub(node)
           formatting = @tags_to_text[node.name]
-          return CONTINUE unless formatting
-          node.add_next_sibling Nokogiri::XML::Text.new("#{formatting[:pre]}#{node.content}#{formatting[:post]}", node.document)
-          node.remove
+          case formatting
+          when Hash
+            node.add_next_sibling Nokogiri::XML::Text.new("#{formatting[:pre]}#{node.content}#{formatting[:post]}", node.document)
+            node.remove
+          when String
+            node.add_next_sibling Nokogiri::XML::Text.new(formatting, node.document)
+            node.remove
+          else
+            CONTINUE
+          end
         end
       end
     end
diff --git a/lib/redmine/wiki_formatting/markdown/html_parser.rb b/lib/redmine/wiki_formatting/markdown/html_parser.rb
index 14f89373a..e2dd1a78c 100644
--- a/lib/redmine/wiki_formatting/markdown/html_parser.rb
+++ b/lib/redmine/wiki_formatting/markdown/html_parser.rb
@@ -32,7 +32,8 @@ module Redmine
           'h3' => {:pre => "\n\n### ", :post => "\n\n"},
           'h4' => {:pre => "\n\n#### ", :post => "\n\n"},
           'h5' => {:pre => "\n\n##### ", :post => "\n\n"},
-          'h6' => {:pre => "\n\n###### ", :post => "\n\n"}
+          'h6' => {:pre => "\n\n###### ", :post => "\n\n"},
+          'style' => ''
         }
       end
     end
diff --git a/lib/redmine/wiki_formatting/textile/html_parser.rb b/lib/redmine/wiki_formatting/textile/html_parser.rb
index 201e69c64..fba6b1d17 100644
--- a/lib/redmine/wiki_formatting/textile/html_parser.rb
+++ b/lib/redmine/wiki_formatting/textile/html_parser.rb
@@ -33,7 +33,8 @@ module Redmine
           'h3' => {:pre => "\n\nh3. ", :post => "\n\n"},
           'h4' => {:pre => "\n\nh4. ", :post => "\n\n"},
           'h5' => {:pre => "\n\nh5. ", :post => "\n\n"},
-          'h6' => {:pre => "\n\nh6. ", :post => "\n\n"}
+          'h6' => {:pre => "\n\nh6. ", :post => "\n\n"},
+          'style' => ''
         }
       end
     end