Updated so we don't escapeHTML unless necessary for the server side. This allows the client-side to receive a JS hash / object directly. This is useful, depending on how the input is rendered.

jbcpollak · jbcpollak · commit 7b0f8c5d2e6a · 2013-08-02T16:42:52.000-04:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -297,7 +297,7 @@ public String prepareUploadTagParams(Map options) {
 	        }
 	    }
 	    
-	    return StringEscapeUtils.escapeHtml(JSONObject.toJSONString(params));
+	    return JSONObject.toJSONString(params);
 	}
 	
 	public String getUploadUrl(Map options) {
@@ -308,7 +308,7 @@ public String getUploadUrl(Map options) {
 	public String imageUploadTag(String field, Map options, Map<String, Object> htmlOptions) {
         if (htmlOptions == null) htmlOptions = Cloudinary.emptyMap();
 		
-        String tagParams = prepareUploadTagParams(options);
+        String tagParams = StringEscapeUtils.escapeHtml(prepareUploadTagParams(options));
         
 		String cloudinaryUploadUrl = getUploadUrl(options);
         

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public String prepareUploadTagParams(Map options) {`
`297`	`297`	`}`
`298`	`298`	`}`
`299`	`299`
`300`		`- return StringEscapeUtils.escapeHtml(JSONObject.toJSONString(params));`
	`300`	`+ return JSONObject.toJSONString(params);`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`public String getUploadUrl(Map options) {`
`@@ -308,7 +308,7 @@ public String getUploadUrl(Map options) {`
`308`	`308`	`public String imageUploadTag(String field, Map options, Map<String, Object> htmlOptions) {`
`309`	`309`	`if (htmlOptions == null) htmlOptions = Cloudinary.emptyMap();`
`310`	`310`
`311`		`- String tagParams = prepareUploadTagParams(options);`
	`311`	`+ String tagParams = StringEscapeUtils.escapeHtml(prepareUploadTagParams(options));`
`312`	`312`
`313`	`313`	`String cloudinaryUploadUrl = getUploadUrl(options);`
`314`	`314`