From 756881966a8d19e07ec40787bf7a359f4dadaa20 Mon Sep 17 00:00:00 2001 From: Type-kun Date: Thu, 8 Sep 2016 22:47:42 +0500 Subject: [PATCH] Fix dtext.parse_strip failing for nil (closes #2662) --- app/logical/d_text.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb index c5242d5c6..3cfa4ad77 100644 --- a/app/logical/d_text.rb +++ b/app/logical/d_text.rb @@ -219,7 +219,7 @@ class DText else "<#{tag}>" + parse_inline(content, options) + "" end - when /\A(h[1-6])\#([A-z][_A-z0-9-]+)\.\s*(.+)\Z/ + when /\A(h[1-6])\#([A-z][_A-z0-9-]+)\.\s*(.+)\Z/ tag = $1 header_id = $2 content = $3 @@ -339,6 +339,8 @@ class DText end def self.strip(s) + return "" if s.blank? + s.gsub!(/[\r\n]+/m, " ") s.gsub!(/\[\/?(?:b|i|s|u|tn|tr|td|th|thead|tbody|quote|code|spoilers|spoiler|expand|table)\]/, "") s.gsub!(/\[\[([^\|\]]+)\|([^\]]+)\]\]/m, '\2')