From: Albert Ting <altlist@gmail.com>
Date: Wed, 13 Apr 2016 21:09:38 +0000 (+0000)
Subject: Bug 1154457 - Extra lines for nested MarkDown lists
X-Git-Tag: release-5.1.1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae22da8710d00232d28b7c6b9093d2b7e33b0627;p=thirdparty%2Fbugzilla.git

Bug 1154457 - Extra lines for nested MarkDown lists
r=dkl
---

diff --git a/Bugzilla/Markdown.pm b/Bugzilla/Markdown.pm
index 49f49c9b0f..a82e9f3e00 100644
--- a/Bugzilla/Markdown.pm
+++ b/Bugzilla/Markdown.pm
@@ -478,6 +478,17 @@ sub _DoBlockQuotes {
     return $text;
 }
 
+sub _DoLists {
+    my ($self, $text) = @_;
+
+    $text = $self->SUPER::_DoLists($text);
+
+    # strip trailing newlines created by DoLists
+    $text =~ s/\n</</g;
+
+    return $text;
+}
+
 sub _EncodeCode {
     my ($self, $text) = @_;