Fixes #2042, fix specs

2013-12-03 17:19:56 -08:00
parent d270f9d98b
commit b618322ac1
5 changed files with 25 additions and 38 deletions
--- a/app/logical/d_text.rb
+++ b/app/logical/d_text.rb
@@ -198,11 +198,17 @@ class DText

      when /\[code\](?!\])/
        flags[:code] = true
+        stack << "pre"
        '<pre>'

      when /\[\/code\](?!\])/
        flags[:code] = false
-        '</pre>'
+        if stack.last == "pre"
+          stack.pop
+          "</pre>"
+        else
+          ""
+        end

      when /\[expand(?:\=([^\]]*))?\](?!\])/
        stack << "expandable"