From 15facc72b395870cff158b267f07d2197ee7bad1 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 15 Aug 2014 11:49:56 +0000
Subject: [PATCH]  * Console: Escaping fix (ticket #1348)

---
 .../java/src/net/i2p/router/web/ConfigUIHandler.java  |  4 ++--
 history.txt                                           | 11 +++++++++--
 router/java/src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java
index e9de89c31..7a9b2c406 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java
@@ -60,12 +60,12 @@ public class ConfigUIHandler extends FormHandler {
         boolean ok = _context.router().saveConfig(changes, removes);
         if (ok) {
             if (!oldTheme.equals(_config))
-                addFormNotice(_("Theme change saved.") +
+                addFormNoticeNoEscape(_("Theme change saved.") +
                               " <a href=\"configui\">" +
                               _("Refresh the page to view.") +
                               "</a>");
             if (oldForceMobileConsole != _forceMobileConsole)
-                addFormNotice(_("Mobile console option saved.") +
+                addFormNoticeNoEscape(_("Mobile console option saved.") +
                               " <a href=\"configui\">" +
                               _("Refresh the page to view.") +
                               "</a>");
diff --git a/history.txt b/history.txt
index e333f71cb..cf3931dc6 100644
--- a/history.txt
+++ b/history.txt
@@ -1,7 +1,14 @@
-2014-08-13 zzz, dg
+2014-08-15 zzz
+ * Console: Escaping fix (ticket #1348)
+ * I2CP: Lookup synch cleanups
+
+2014-08-13 dg
+ * Console, EventLog: add BECAME_FLOODFILL and NOT_FLOODFILL, they are now shown
+   at the /events page when the router changes its floodfill state
+
+2014-08-13 zzz
  * Console: Escaping fix (ticket #1346)
  * i2psnark: Fix add torrent NPE
- * Console, EventLog: add BECAME_FLOODFILL and NOT_FLOODFILL, they are now shown at the /events page when the router changes its floodfill state
 
 2014-08-10 zzz
 Prop from i2p.i2p.zzz.snarkconfig:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f6e6df3a5..4e28a2c8d 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 4;
+    public final static long BUILD = 5;
 
     /** for example "-test" */
     public final static String EXTRA = "";