From f9d43a8a5fcd84a5ddd84b9861edadc750c76641 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 6 Feb 2011 14:22:32 +0000
Subject: [PATCH]     * i2psnark: Fix maggot links, and magnet links with
 trailing parameters (thx user)

---
 .../java/src/org/klomp/snark/web/I2PSnarkServlet.java         | 4 ++--
 history.txt                                                   | 3 +++
 router/java/src/net/i2p/router/RouterVersion.java             | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 9bbfec8fe..c504c7d75 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -1409,13 +1409,13 @@ public class I2PSnarkServlet extends Default {
             ihash = url.substring(MAGNET.length()).trim();
             int amp = ihash.indexOf('&');
             if (amp >= 0)
-                ihash = url.substring(0, amp);
+                ihash = ihash.substring(0, amp);
             name = "Magnet " + ihash;
         } else if (url.startsWith(MAGGOT)) {
             ihash = url.substring(MAGGOT.length()).trim();
             int col = ihash.indexOf(':');
             if (col >= 0)
-                ihash = url.substring(0, col);
+                ihash = ihash.substring(0, col);
             name = "Maggot " + ihash;
         } else {
             return;
diff --git a/history.txt b/history.txt
index b501b483c..4a050aee4 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2011-02-06 zzz
+    * i2psnark: Fix maggot links, and magnet links with trailing parameters (thx user)
+
 2011-02-05 zzz
     * .mtn-ignore: New, to make it harder to check in stuff you shouldn't
     * BOB: Drop checked-in build dir
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0725033fa..f6e6df3a5 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 = 3;
+    public final static long BUILD = 4;
 
     /** for example "-test" */
     public final static String EXTRA = "";