From fc292cd29d9b674bb5d4adb811cae98c2b87e95d Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 17 Jan 2012 02:59:21 +0000
Subject: [PATCH] Fix for #588 part 4: Pull out escaping of & separately first

---
 core/java/src/net/i2p/data/DataHelper.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index cf99ea6f42..f3e4151c28 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -1476,11 +1476,10 @@ public class DataHelper {
     public static String escapeHTML(String unescaped) {
         if (unescaped == null) return "";
         Map<String, String> map = new HashMap<String, String>();
-        map.put("&","&amp;");
         map.put("\"","&quot;");
         map.put("<","&lt;");
         map.put(">","&gt;");
-        String escaped = unescaped;
+        String escaped = unescaped.replaceAll("&","&amp;");
         for (Map.Entry<String, String> entry : map.entrySet()) {
             String k = entry.getKey();
             String v = entry.getValue();
-- 
GitLab