Fix for 3.1.2.10 (#66)

omod/src/main/java/org/openmrs/module/attachments/rest/AttachmentBytesResource.java

@@ -3,6 +3,7 @@
 import static org.openmrs.module.attachments.AttachmentsContext.getContentFamily;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -23,6 +24,7 @@
 import org.openmrs.module.webservices.rest.web.response.ResponseException;
 import org.openmrs.module.webservices.rest.web.v1_0.controller.BaseRestController;
 import org.openmrs.obs.ComplexData;
+import org.openmrs.web.WebUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -69,7 +71,12 @@ public void getFile(@PathVariable("uuid") String uuid, @RequestParam(required =
 		response.addHeader("File-Ext", getExtension(attComplexData.getTitle(), mimeType));
 
 		try {
-			response.getOutputStream().write(attComplexData.asByteArray());
+			byte[] bytes = attComplexData.asByteArray();
+			if (mimeType != null && mimeType.startsWith("text")) {
+				String byteString = WebUtil.encodeForHtmlContent(new String(bytes, StandardCharsets.UTF_8));
+				bytes = byteString.getBytes(StandardCharsets.UTF_8);
+			}
+			response.getOutputStream().write(bytes);
 		}
 		catch (IOException ex) {
 			response.setStatus(500);