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
2015-04-01 14:45:51 +00:00 · 2015-04-01 14:45:51 +00:00 · 48c31310f3
commit 48c31310f3
parent 080cbb9957
3 changed files with 4 additions and 2 deletions
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@ -1 +1 @@
-9350
+9351
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@ -1 +1 @@
-f293fdf225ed0745de63f9f205407ccc2b8a44d4
+1fbcede24288ad8abdeaf49255e5c0996ac2df4c
--- 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;
 }