summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Markdown.pm
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2014-10-28 04:01:01 +0100
committerDavid Lawrence <dkl@mozilla.com>2014-10-28 04:01:01 +0100
commit1f5404213d4b93ef573e99112536ed5af6643770 (patch)
tree754731f5b78b85a71a35b700bfb28ce020342c3d /Bugzilla/Markdown.pm
parent2fbc1045f5b8e82d9a68328c35ba07d70d9d1877 (diff)
downloadbugzilla-1f5404213d4b93ef573e99112536ed5af6643770.tar.gz
bugzilla-1f5404213d4b93ef573e99112536ed5af6643770.tar.xz
Bug 1059684: markdown text should not be rendered within a <pre> tag
r=glob,a=glob
Diffstat (limited to 'Bugzilla/Markdown.pm')
-rw-r--r--Bugzilla/Markdown.pm9
1 files changed, 1 insertions, 8 deletions
diff --git a/Bugzilla/Markdown.pm b/Bugzilla/Markdown.pm
index 3023d98e2..353c2ff6a 100644
--- a/Bugzilla/Markdown.pm
+++ b/Bugzilla/Markdown.pm
@@ -99,7 +99,7 @@ sub _RunSpanGamut {
$text = $self->_EncodeAmpsAndAngles($text);
$text = $self->_DoItalicsAndBold($text);
- $text =~ s/ {2,}\n/ <br$self->{empty_element_suffix}\n/g;
+ $text =~ s/\n/<br$self->{empty_element_suffix}\n/g;
return $text;
}
@@ -323,13 +323,6 @@ sub _DoItalicsAndBold {
return $text;
}
-# Override this function to ignore 'wrap_in_p_tags' from
-# the caller and to not generate <p> tags around the output.
-sub _FormParagraphs {
- my ($self, $text) = @_;
- return $self->SUPER::_FormParagraphs($text, { wrap_in_p_tags => 0 });
-}
-
sub _DoStrikethroughs {
my ($self, $text) = @_;