Merge branch 'master' into next

diff --git a/pom.xml b/pom.xml
index b315d28..ca493d8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>net.pterodactylus</groupId>
        <artifactId>sone</artifactId>
-       <version>0.4</version>
+       <version>0.4.1</version>
        <dependencies>
                <dependency>
                        <groupId>net.pterodactylus</groupId>

diff --git a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
index 02235d2..51e8df4 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
+++ b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
@@ -49,7 +49,7 @@ public class UpdateChecker {
        private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
 
        /** The current latest known edition. */
-       private static final int LATEST_EDITION = 24;
+       private static final int LATEST_EDITION = 25;
 
        /** The Freenet interface. */
        private final FreenetInterface freenetInterface;

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 4fc34d9..2d53e8b 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -78,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
        }
 
        /** The version. */
-       public static final Version VERSION = new Version(0, 4);
+       public static final Version VERSION = new Version(0, 4, 1);
 
        /** The logger. */
        private static final Logger logger = Logging.getLogger(SonePlugin.class);

diff --git a/src/main/resources/templates/insert/sone.xml b/src/main/resources/templates/insert/sone.xml
index 9ba037f..e25cac9 100644 (file)
--- a/src/main/resources/templates/insert/sone.xml
+++ b/src/main/resources/templates/insert/sone.xml
@@ -19,7 +19,7 @@
                <fields>
                        <%foreach currentSone.profile.fields field>
                        <field>
-                               <field-name><% field.key|xml></field-name>
+                               <field-name><% field.name|xml></field-name>
                                <field-value><% field.value|xml></field-value>
                        </field>
                        <%/foreach>