diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-11-19 17:20:39 +0100 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-11-19 17:20:39 +0100 |
| commit | f1adcd997f1dc08b60004cd2fe9b356ace295f54 (patch) | |
| tree | 6fad9ee3020773ffa03db341de2a7532e388e6c0 | |
| parent | f4b1c3da1d1ebacc04ebb65275d46e6df63416fa (diff) | |
| download | bugzilla-f1adcd997f1dc08b60004cd2fe9b356ace295f54.tar.gz bugzilla-f1adcd997f1dc08b60004cd2fe9b356ace295f54.tar.xz | |
Bug 929345: bug history/activity shouldn't collapse multi-line values to a single line
| -rw-r--r-- | Bugzilla/Template.pm | 8 | ||||
| -rw-r--r-- | t/008filter.t | 2 | ||||
| -rw-r--r-- | template/en/default/bug/activity/table.html.tmpl | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index c3839b11b..81202965c 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -682,14 +682,6 @@ sub create { return $var; }, - # preserve newline by converting them to <br> - html_br => sub { - my ($var) = @_; - $var = html_quote($var); - $var =~ s/\n/<br>/g; - return $var; - }, - # Prevents line break on hyphens and whitespaces. no_break => sub { my ($var) = @_; diff --git a/t/008filter.t b/t/008filter.t index 9b6a2dad6..d0c0311f6 100644 --- a/t/008filter.t +++ b/t/008filter.t @@ -225,7 +225,7 @@ sub directive_ok { return 1 if $directive =~ /FILTER\ (html|csv|js|base64|css_class_quote|ics| quoteUrls|time|uri|xml|lower|html_light| obsolete|inactive|closed|unitconvert| - txt|html_linebreak|html_br|none|json)\b/x; + txt|html_linebreak|none|json)\b/x; return 0; } diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 86a89297b..8098d89b2 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -110,7 +110,7 @@ change.fieldname == 'flagtypes.name' %] [% display_value(change.fieldname, change_type) FILTER email FILTER html %] [% ELSE %] - [% display_value(change.fieldname, change_type) FILTER html_br %] + [% display_value(change.fieldname, change_type) FILTER html FILTER html_line_break %] [% END %] [% ELSE %] |