Fixes #1459

stamparm · stamparm · commit 47a42c234e89 · 2015-10-10T19:19:50.000+02:00
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -308,8 +308,8 @@ def cleanupPayload(self, payload, origValue=None):
         for _ in set(re.findall(r"\[RANDSTR(?:\d+)?\]", payload, re.I)):
             payload = payload.replace(_, randomStr())
 
-        if origValue is not None:
-            payload = payload.replace("[ORIGVALUE]", origValue if origValue.isdigit() else unescaper.escape("'%s'" % origValue))
+        if origValue is not None and "[ORIGVALUE]" in payload:
+            payload = getUnicode(payload).replace("[ORIGVALUE]", origValue if origValue.isdigit() else unescaper.escape("'%s'" % origValue))
 
         if "[INFERENCE]" in payload:
             if Backend.getIdentifiedDbms() is not None:
