IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-10 04:58:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Support carriage return in InlineUploads.

Browse Source 
Follow up to 8deaef3872.
This commit is contained in:
Guo Xiang Tan
2019-06-21 14:07:06 +08:00
parent 8deaef3872
commit 7c86f16aa3
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/inline_uploads.rb
+7 -3
View File
@@ -214,7 +214,7 @@ class InlineUploads
end
def self.match_img(markdown, external_src: false)
markdown.scan(/(([ ]*)<(?!img)[^<>]+\/?>)?(\n*)(([ ]*)<img ([^>\n]+)>([ ]*))(\n*)/) do |match|
markdown.scan(/(([ ]*)<(?!img)[^<>]+\/?>)?([\r\n]*)(([ ]*)<img ([^>\n]+)>([ ]*))([\r\n]*)/) do |match|
node = Nokogiri::HTML::fragment(match[3].strip).children[0]
src = node.attributes["src"]&.value
@@ -245,8 +245,12 @@ class InlineUploads
match[3].strip! if !after_html_tag
if match[1].nil? || match[1].length < 4
yield(match[3], src, replacement, $~.offset(0)[0]) if block_given?
if (match[1].nil? || match[1].length < 4)
if (match[4].nil? || match[4].length < 4)
yield(match[3], src, replacement, $~.offset(0)[0]) if block_given?
else
yield(match[3], src, match[3].sub(src, PATH_PLACEHOLDER), $~.offset(0)[0]) if block_given?
end
else
yield(match[3], src, match[3].sub(src, PATH_PLACEHOLDER), $~.offset(0)[0]) if block_given?
end