From 553201db2197579c7522c87baccd3fb7b633bf31 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 17 Jan 2012 02:17:05 +0000
Subject: [PATCH] Fix for #588 part 3: Escape & character FIRST so other
 escapes aren't broken

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

diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index 6dfead3b3..cf99ea6f4 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -1476,8 +1476,8 @@ public class DataHelper {
     public static String escapeHTML(String unescaped) {
         if (unescaped == null) return "";
         Map<String, String> map = new HashMap<String, String>();
-        map.put("\"","&quot;");
         map.put("&","&amp;");
+        map.put("\"","&quot;");
         map.put("<","&lt;");
         map.put(">","&gt;");
         String escaped = unescaped;
@@ -1497,8 +1497,8 @@ public class DataHelper {
     public static String unescapeHTML(String escaped) {
         if (escaped == null) return "";
         Map<String, String> map = new HashMap<String, String>();
-        map.put("&quot;","\"");
         map.put("&amp;","&");
+        map.put("&quot;","\"");
         map.put("&lt;","<");
         map.put("&gt;",">");
         String unescaped = escaped;