From 0f2345625943fe9bef2fb249a1a474ace5fcb3d9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 21 Jul 2014 13:09:57 -0400
Subject: [PATCH] FIX: Instead of patching markdown-js, fix the issue in
 Discourse.

---
 app/assets/javascripts/discourse/dialects/html.js | 5 ++++-
 vendor/assets/javascripts/better_markdown.js      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/dialects/html.js b/app/assets/javascripts/discourse/dialects/html.js
index bf5a5752396..eae656d16f0 100644
--- a/app/assets/javascripts/discourse/dialects/html.js
+++ b/app/assets/javascripts/discourse/dialects/html.js
@@ -41,7 +41,10 @@ Discourse.Dialect.registerBlock('html', function(block, next) {
     var tag = m[1].split(/\s/);
     if (tag && tag[0] && blockTags.indexOf(tag[0]) !== -1) {
       split = splitAtLast(tag[0], block, next);
-      if (split) { return split; }
+      if (split) {
+        if (split.length === 1 && split[0] === block) { return; }
+        return split;
+      }
       return [ block.toString() ];
     }
   }
diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
index 47e9369e952..732764d8cfd 100644
--- a/vendor/assets/javascripts/better_markdown.js
+++ b/vendor/assets/javascripts/better_markdown.js
@@ -1013,7 +1013,7 @@
 
               if (firstBlock) {
 
-                if (isArray(firstBlock)) { firstBlock.shift(); }
+                firstBlock.shift();
                 contents.splice.apply(contents, [0, 1].concat(firstBlock));
                 add( last_li, loose, contents, nl );