# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1409066502 -7200
# Node ID 8eeb4b717dcae1f71e5744da57d2a761c6312eec
# Parent  7021753b379770e6fae7d3f689f085ab9dde3214# Parent  d4e4dde1d5cb3c4f4a98ea48ee1c45582ecef2d6
Merged.

diff -r d4e4dde1d5cb -r 8eeb4b717dca artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java	Tue Aug 26 17:16:21 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java	Tue Aug 26 17:21:42 2014 +0200
@@ -1172,7 +1172,10 @@
                 result[0] = null;
                 if (frames.getStore(key, result)) {
                     m.appendReplacement(
-                        sb, result[0] != null ? result[0].toString() : "");
+                        sb,
+                        result[0] != null 
+                            ? Matcher.quoteReplacement(result[0].toString())
+                            : "");
                 }
                 else {
                     m.appendReplacement(sb, "\\${" + key + "}");
@@ -1189,7 +1192,9 @@
                 String expr = m.group(1);
                 Object result = evaluateXPath(expr, XPathConstants.STRING);
                 if (result instanceof String) {
-                    m.appendReplacement(sb, (String)result);
+                    m.appendReplacement(
+                        sb,
+                        Matcher.quoteReplacement((String)result));
                 }
                 else {
                     m.appendReplacement(sb, "");