From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 29 Oct 2010 10:02:24 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.2-RC1~97
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=2a38345ba7eb550e3ad84d3f38ed84ee0333c4fd;hp=b29cf0908e6dfd2b55220a3a7e44200f2fe5b19e;p=Sone.git

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index 18b5594..2af0145 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>sone</artifactId>
-	<version>0.1-RC2</version>
+	<version>0.1-RC3</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 99ebc6d..173f1d4 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -61,9 +61,9 @@ public class Core extends AbstractService {
 
 	static {
 		/* Sone of Sone. */
-		defaultSones.add("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/3");
+		defaultSones.add("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/4");
 		/* Sone of Bombe. */
-		defaultSones.add("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/24");
+		defaultSones.add("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/29");
 	}
 
 	/**
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index ecf7f5b..531bc90 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -79,7 +79,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version("RC2", 0, 1);
+	public static final Version VERSION = new Version("RC3", 0, 1);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
diff --git a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
index f977556..dfd3760 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
@@ -65,7 +65,7 @@ public class CreateSonePage extends SoneTemplatePage {
 		String insertUri = null;
 		if (request.getMethod() == Method.POST) {
 			name = request.getHttpRequest().getPartAsStringFailsafe("name", 100);
-			if (request.getHttpRequest().getParam("create-from-uri").length() > 0) {
+			if (request.getHttpRequest().isPartSet("create-from-uri")) {
 				requestUri = request.getHttpRequest().getPartAsStringFailsafe("request-uri", 256);
 				insertUri = request.getHttpRequest().getPartAsStringFailsafe("insert-uri", 256);
 			}