Merge branch 'QuentinC-fix-tab-escape' into master

The contribution branch was rebased to current master.
This should close #1065 as merged.

1 files changed, 9 insertions, 1 deletions

diff --git a/src/main/java/com/gitblit/utils/StringUtils.java b/src/main/java/com/gitblit/utils/StringUtils.java
index 442acbbf..0e23d637 100644
--- a/src/main/java/com/gitblit/utils/StringUtils.java
+++ b/src/main/java/com/gitblit/utils/StringUtils.java
@@ -105,6 +105,8 @@ public class StringUtils {
 	public static String escapeForHtml(String inStr, boolean changeSpace, int tabLength) {

 		StringBuilder retStr = new StringBuilder();

 		int i = 0;

+		int l = 0;

+		

 		while (i < inStr.length()) {

 			if (inStr.charAt(i) == '&') {

 				retStr.append("&amp;");

@@ -117,12 +119,18 @@ public class StringUtils {
 			} else if (changeSpace && inStr.charAt(i) == ' ') {

 				retStr.append("&nbsp;");

 			} else if (changeSpace && inStr.charAt(i) == '\t') {

-				for (int j = 0; j < tabLength; j++) {

+				for (int j = 0; j < tabLength - l; j++) {

 					retStr.append("&nbsp;");

 				}

+				l = -1;

 			} else {

 				retStr.append(inStr.charAt(i));

 			}

+			

+			l = (l + 1) % tabLength;

+			if (inStr.charAt(i) == '\n') {

+				l = 0;

+			}

 			i++;

 		}

 		return retStr.toString();