From d4b95298902c8cea1411fc696ed80028b6091aa7 Mon Sep 17 00:00:00 2001 From: Rafael Cavazin <rafaelcavazin@gmail.com> Date: Thu, 06 Dec 2012 11:25:01 -0500 Subject: [PATCH] Update from upstream/master --- src/com/gitblit/wicket/pages/BlobPage.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java index f4d6e5b..e2b8546 100644 --- a/src/com/gitblit/wicket/pages/BlobPage.java +++ b/src/com/gitblit/wicket/pages/BlobPage.java @@ -169,10 +169,11 @@ sb.append("<table width=\"100%\"><tbody>"); - String linePattern = "<tr class=\"{0}\"><td><a href=\"#L{2}\">{1}</a></tr>"; + String linePattern = "<tr class=\"{0}\"><td><a href=\"#L{2}\">{1}</a>\r</tr>"; for (int i = 0; i < lines.length; i++) { + String line = lines[i].replace('\r', ' '); String cssClass = (i % 2 == 0) ? "even" : "odd"; - sb.append(MessageFormat.format(linePattern, cssClass, lines[i], "" + (i + 1))); + sb.append(MessageFormat.format(linePattern, cssClass, line, "" + (i + 1))); } sb.append("</tbody></table></pre>"); sb.append("</pre>"); -- Gitblit v1.9.1