propagate from branch 'i2p.i2p' (head b7ee04ecc7a594239e977b25a52ebdabadce558e)

to branch 'i2p.i2p.zzz.jetty6' (head 2cd4a4dae8b87b9ed2128d83aff1b39e3a818556)
This commit is contained in:
zzz
2012-01-08 14:55:10 +00:00
110 changed files with 16328 additions and 6694 deletions

View File

@ -614,7 +614,8 @@ public class Storage
} catch (Exception ex) {
ex.printStackTrace();
}
} }
}
}
_filterNameCache.put(name, rv);
return rv;
}

View File

@ -2073,9 +2073,11 @@ private static class FetchAndAdd implements Runnable {
// buf.append("<input type=\"hidden\" name=\"p\" value=\"").append(peerParam).append("\" >\n");
buf.append(_("Torrent was not retrieved from {0}", urlify(_url)));
String link = _url.replace("&", "&amp;").replace(" ", "%20").replace(":", "%3A").replace("/", "%2F");
/**** FIXME ticket #575
buf.append(" - [<a href=\"/i2psnark/?newURL=").append(link).append("#add\" >");
buf.append(_("Retry"));
buf.append("</a>]");
****/
_manager.addMessage(buf.toString());
}
} finally {