Fix linefeed problem for Prettify (issue 130)

diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java
index f4d6e5b6d5b3c95782c433a1a26570c5b7c5fd1d..e2b8546b9bcb85454b5be8652fcd84cd0c9d5019 100644 (file)
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/com/gitblit/wicket/pages/BlobPage.java
@@ -169,10 +169,11 @@ public class BlobPage extends RepositoryPage {
                \r
                sb.append("<table width=\"100%\"><tbody>");\r
                \r
-               String linePattern = "<tr class=\"{0}\"><td><a href=\"#L{2}\">{1}</a></tr>";\r
+               String linePattern = "<tr class=\"{0}\"><td><a href=\"#L{2}\">{1}</a>\r</tr>";\r
                for (int i = 0; i < lines.length; i++) {\r
+                       String line = lines[i].replace('\r', ' ');\r
                        String cssClass = (i % 2 == 0) ? "even" : "odd";\r
-                       sb.append(MessageFormat.format(linePattern, cssClass, lines[i], "" + (i + 1)));\r
+                       sb.append(MessageFormat.format(linePattern, cssClass, line, "" + (i + 1)));\r
                }\r
                sb.append("</tbody></table></pre>");\r
                sb.append("</pre>");\r