Fix gollum#607

github · Dec 15, 2012 · cb1a633 · cb1a633
1 parent ace4db6
commit cb1a633
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb
@@ -475,7 +475,7 @@ def extract_gitcode data
     #
     # Returns the placeholder'd String data.
     def extract_code(data)
-      data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)\r?$/m) do
+      data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)[ \t\r]*$/m) do
         m_indent = $1
         m_start  = $2 # ~~~
         m_lang   = $3
@@ -504,7 +504,7 @@ def extract_code(data)
         "#{m_indent}#{id}" # print the SHA1 ID with the proper indentation
       end
 
-      data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```\r?$/m) do
+      data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```[ \t\r]*$/m) do
         lang   = $2 ? $2.strip : nil
         id     = Digest::SHA1.hexdigest("#{lang}.#{$3}")
         cached = check_cache(:code, id)