diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-08-11 05:01:37 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-08-11 05:01:37 +0000 |
| commit | f5c7a4a4208c9c146544b4498de3a08761cbc55a (patch) | |
| tree | 8612620b530885d8e69b3c122281312b35255e31 /lib/redmine/wiki_formatting/html_parser.rb | |
| parent | 3c91a3d5b2f9a2ce55b941ee68fbaa596b5b3052 (diff) | |
| download | redmine-f5c7a4a4208c9c146544b4498de3a08761cbc55a.tar.gz redmine-f5c7a4a4208c9c146544b4498de3a08761cbc55a.zip | |
Convert HTML links to Textile/Markdown links when creating an issue from an email (#31695).
Patch by Yuichi HARADA.
git-svn-id: http://svn.redmine.org/redmine/trunk@18361 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/wiki_formatting/html_parser.rb')
| -rw-r--r-- | lib/redmine/wiki_formatting/html_parser.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/html_parser.rb b/lib/redmine/wiki_formatting/html_parser.rb index 80f15b72c..f6f9639e0 100644 --- a/lib/redmine/wiki_formatting/html_parser.rb +++ b/lib/redmine/wiki_formatting/html_parser.rb @@ -36,7 +36,7 @@ module Redmine doc.scrub!(WikiTags.new(tags)) doc.scrub!(:newline_block_elements) - Loofah.remove_extraneous_whitespace(doc.text).strip.squeeze(' ').gsub(/^ +/, '') + Loofah.remove_extraneous_whitespace(doc.text(:encode_special_chars => false)).strip.squeeze(' ').gsub(/^ +/, '') end class WikiTags < ::Loofah::Scrubber @@ -54,6 +54,9 @@ module Redmine when String node.add_next_sibling Nokogiri::XML::Text.new(formatting, node.document) node.remove + when Proc + node.add_next_sibling formatting.call(node) + node.remove else CONTINUE end |