fixes #530

2014-02-27 13:41:36 -08:00
parent e53f19d9dd
commit 165e3a4efa
4 changed files with 36 additions and 3 deletions
--- a/app/assets/javascripts/comments.js
+++ b/app/assets/javascripts/comments.js
@@ -19,7 +19,18 @@
  }

  Danbooru.Comment.quote_message = function(data) {
-    var stripped_body = data["body"].replace(/\[quote\](?:.|\n|\r)+?\[\/quote\](?:\r\n|\r|\n)*/gm, "");
+    var blocks = data["body"].match(/\[\/?quote\]|./gm);
+    var n = 0;
+    var stripped_body = "";
+    $.each(blocks, function(i, block) {
+      if (block === "[quote]") {
+        n += 1;
+      } else if (block == "[/quote]") {
+        n -= 1;
+      } else if (n === 0) {
+        stripped_body += block;
+      }
+    });
    return "[quote]\n" + data["creator_name"] + " said:\n\n" + stripped_body + "\n[/quote]\n\n";
  }