Fix HTML escaping

tallevami-home · tallevami-home · commit 34a3b6c640c9 · 2015-06-16T12:43:38.000+03:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/utils/HtmlEscape.java b/cloudinary-core/src/main/java/com/cloudinary/utils/HtmlEscape.java
@@ -26,7 +26,7 @@ public class HtmlEscape {
    */ 
   public static String escapeTextArea(String original) 
   { 
-    return escapeSpecial(escapeTags(original));     
+    return escapeTags(escapeSpecial(original));     
   } 
    
   /** 
@@ -36,7 +36,7 @@ public static String escapeTextArea(String original)
    */ 
   public static String escape(String original) 
   { 
-    return escapeSpecial(escapeBr(escapeTags(original))); 
+    return escapeBr(escapeTags(escapeSpecial(original))); 
   } 
    
   public static String escapeTags(String original) 
diff --git a/cloudinary-core/src/main/java/com/cloudinary/utils/StringUtils.java b/cloudinary-core/src/main/java/com/cloudinary/utils/StringUtils.java
@@ -71,7 +71,7 @@ public static String encodeHexString(byte[] bytes) {
 	}
 
 	public static String escapeHtml(String input) {
-		return HtmlEscape.escape(input);
+		return HtmlEscape.escapeTextArea(input);
 	}
 
 	public static boolean isNotBlank(Object input) {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class HtmlEscape {`
`26`	`26`	`*/`
`27`	`27`	`public static String escapeTextArea(String original)`
`28`	`28`	`{`
`29`		`- return escapeSpecial(escapeTags(original));`
	`29`	`+ return escapeTags(escapeSpecial(original));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`
`@@ -36,7 +36,7 @@ public static String escapeTextArea(String original)`
`36`	`36`	`*/`
`37`	`37`	`public static String escape(String original)`
`38`	`38`	`{`
`39`		`- return escapeSpecial(escapeBr(escapeTags(original)));`
	`39`	`+ return escapeBr(escapeTags(escapeSpecial(original)));`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public static String escapeTags(String original)`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public static String encodeHexString(byte[] bytes) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public static String escapeHtml(String input) {`
`74`		`- return HtmlEscape.escape(input);`
	`74`	`+ return HtmlEscape.escapeTextArea(input);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public static boolean isNotBlank(Object input) {`