aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-06-01 20:35:51 +0200
committerChristian Schneppe <christian@pix-art.de>2016-06-01 20:35:51 +0200
commit05100b0a4de85edc6c49c15cdc050ed7ece2b3d0 (patch)
treef702f2a42f7d09a0d2ff20ca7f9f8b65f64643eb /src/main/java/eu/siacs/conversations/utils
parentc41e6004909c10d4d24c7030d584f8e9fdf52d7c (diff)
parent20ba1add1eaeb43a522189a85471ac3c4e1a3933 (diff)
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
-rw-r--r--src/main/java/eu/siacs/conversations/utils/XmlHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/XmlHelper.java b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java
index 198ce28b9..8cd551a0a 100644
--- a/src/main/java/eu/siacs/conversations/utils/XmlHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java
@@ -7,7 +7,7 @@ public class XmlHelper {
content = content.replace(">", "&gt;");
content = content.replace("\"", "&quot;");
content = content.replace("'", "&apos;");
- content = content.replaceAll("\\p{Cc}", "");
+ content = content.replaceAll("\\p{Cc}&&[^\n\r\t]", "");
return content;
}
}