Merge pull request #2998 from evazion/fix-quote-stripping

Fix [quote] stripping for comments, forum post replies.

app/logical/d_text.rb

@@ -12,11 +12,22 @@ class DText
     CGI.escapeHTML(string)
   end
 
+  def self.quote(message, creator_name)
+    stripped_body = DText.strip_blocks(message, "quote")
+    "[quote]\n#{creator_name} said:\n\n#{stripped_body}\n[/quote]\n\n"
+  end
+
   def self.strip_blocks(string, tag)
-    blocks = string.scan(/\[\/?#{tag}\]|.+?(?=\[\/?#{tag}\]|$)/m)
     n = 0
     stripped = ""
-    blocks.each do |block|
+    string = string.dup
+
+    string.gsub!(/\s*\[#{tag}\](?!\])\s*/mi, "\n\n[#{tag}]\n\n")
+    string.gsub!(/\s*\[\/#{tag}\]\s*/mi, "\n\n[/#{tag}]\n\n")
+    string.gsub!(/(?:\r?\n){3,}/, "\n\n")
+    string.strip!
+
+    string.split(/\n{2}/).each do |block|
       case block
       when "[#{tag}]"
         n += 1
@@ -26,7 +37,7 @@ class DText
 
       else
         if n == 0
-          stripped += block
+          stripped << "#{block}\n\n"
         end
       end
     end

app/logical/mentionable.rb

@@ -16,31 +16,10 @@ module Mentionable
     end
   end
 
-  def strip_quote_blocks(str)
-    stripped = ""
-    str.gsub!(/\s*\[quote\](?!\])\s*/m, "\n\n[quote]\n\n")
-    str.gsub!(/\s*\[\/quote\]\s*/m, "\n\n[/quote]\n\n")
-    str.gsub!(/(?:\r?\n){3,}/, "\n\n")
-    str.strip!
-    nest = 0
-    str.split(/\n{2}/).each do |block|
-      if block == "[quote]"
-        nest += 1
-
-      elsif block == "[/quote]"
-        nest -= 1
-
-      elsif nest == 0
-        stripped << "#{block}\n"
-      end
-    end
-
-    stripped
-  end
-
   def queue_mention_messages
     from_id = read_attribute(self.class.mentionable_option(:user_field))
-    text = strip_quote_blocks(read_attribute(self.class.mentionable_option(:message_field)))
+    text = read_attribute(self.class.mentionable_option(:message_field))
+    text = DText.strip_blocks(text, "quote")
 
     names = text.scan(DText::MENTION_REGEXP).map do |mention|
       mention.gsub!(/(?:^\s*@)|(?:[:;,.!?\)\]<>]$)/, "")