From 48c31310f3a32f54a483accb4d9d73d82d6b01a2 Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 1 Apr 2015 14:45:51 +0000
Subject: [PATCH] Bug 1093868: Markdown text rendering in comments is broken
 after commit from bug 1059684 r=dkl,a=glob

git-svn-id: svn://10.0.0.236/trunk@265896 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev              | 2 +-
 mozilla/webtools/bugzilla/.gitrev              | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Template.pm | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index d5cbca59ae6..7e89e4f86ac 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9350
\ No newline at end of file
+9351
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 06fbc701fc0..e144bc3fc28 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-f293fdf225ed0745de63f9f205407ccc2b8a44d4
\ No newline at end of file
+1fbcede24288ad8abdeaf49255e5c0996ac2df4c
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template.pm b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
index 6de927b9ad5..653a8c51f80 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
@@ -367,6 +367,8 @@ sub get_bug_link {
     my $linkified;
     $template->process('bug/link.html.tmpl', 
         { bug => $bug, link_text => $link_text, %$options }, \$linkified);
+    $linkified =~ s/\n//g;        # strip newlines to prevent markdown conflicts
+    $linkified =~ s/\|/&#124;/g;  # escape '|', it confuses markdown tables
     return $linkified;
 }