summaryrefslogtreecommitdiffstats
path: root/lib/redmine
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-05-25 02:13:57 +0000
committerGo MAEDA <maeda@farend.jp>2021-05-25 02:13:57 +0000
commit695bd72dbda5398345bb203f39937454777f9e16 (patch)
treeac021dd0cfc86fdcb3f3ca6865ea7d0e75876a4b /lib/redmine
parenta3e6b3fb138404e633dfa4c3b98d5cdc2cea35a4 (diff)
downloadredmine-695bd72dbda5398345bb203f39937454777f9e16.tar.gz
redmine-695bd72dbda5398345bb203f39937454777f9e16.zip
Merged r20998 from trunk to 4.2-stable (#35036).
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@21007 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
-rw-r--r--lib/redmine/wiki_formatting/markdown/formatter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/markdown/formatter.rb b/lib/redmine/wiki_formatting/markdown/formatter.rb
index 9d1637125..418ab8b14 100644
--- a/lib/redmine/wiki_formatting/markdown/formatter.rb
+++ b/lib/redmine/wiki_formatting/markdown/formatter.rb
@@ -89,7 +89,7 @@ module Redmine
i = 0
l = 1
inside_pre = false
- @text.split(/(^(?:.+\r?\n\r?(?:\=+|\-+)|#+.+|(?:~~~|```).*)\s*$)/).each do |part|
+ @text.split(/(^(?:\S+\r?\n\r?(?:\=+|\-+)|#+.+|(?:~~~|```).*)\s*$)/).each do |part|
level = nil
if part =~ /\A(~{3,}|`{3,})(\s*\S+)?\s*$/
if !inside_pre