Merge branch 'next' into profile-fields

diff --combined src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
index 1183100,01d4815..5b2c301
--- 1/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
--- 2/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
@@@ -21,6 -21,7 +21,7 @@@ import net.pterodactylus.sone.data.Prof
  import net.pterodactylus.sone.data.Sone;
  import net.pterodactylus.sone.web.page.Page.Request.Method;
  import net.pterodactylus.util.number.Numbers;
+ import net.pterodactylus.util.template.DataProvider;
  import net.pterodactylus.util.template.Template;
  import freenet.clients.http.ToadletContext;
  
@@@ -51,8 -52,8 +52,8 @@@ public class EditProfilePage extends So
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(Request request, Template template) throws RedirectException {
-               super.processTemplate(request, template);
+       protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
+               super.processTemplate(request, dataProvider);
                ToadletContext toadletContenxt = request.getToadletContext();
                Sone currentSone = getCurrentSone(toadletContenxt);
                Profile profile = currentSone.getProfile();
@@@ -63,27 -64,27 +64,27 @@@
                Integer birthMonth = profile.getBirthMonth();
                Integer birthYear = profile.getBirthYear();
                if (request.getMethod() == Method.POST) {
 -                      firstName = request.getHttpRequest().getPartAsStringFailsafe("first-name", 256).trim();
 -                      middleName = request.getHttpRequest().getPartAsStringFailsafe("middle-name", 256).trim();
 -                      lastName = request.getHttpRequest().getPartAsStringFailsafe("last-name", 256).trim();
 -                      birthDay = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-day", 256).trim());
 -                      birthMonth = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-month", 256).trim());
 -                      birthYear = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-year", 256).trim());
 -                      profile.setFirstName(firstName.length() > 0 ? firstName : null);
 -                      profile.setMiddleName(middleName.length() > 0 ? middleName : null);
 -                      profile.setLastName(lastName.length() > 0 ? lastName : null);
 -                      profile.setBirthDay(birthDay).setBirthMonth(birthMonth).setBirthYear(birthYear);
 -                      if (profile.isModified()) {
 +                      if (request.getHttpRequest().getPartAsStringFailsafe("saveProfile", 4).equals("true")) {
 +                              firstName = request.getHttpRequest().getPartAsStringFailsafe("first-name", 256).trim();
 +                              middleName = request.getHttpRequest().getPartAsStringFailsafe("middle-name", 256).trim();
 +                              lastName = request.getHttpRequest().getPartAsStringFailsafe("last-name", 256).trim();
 +                              birthDay = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-day", 256).trim());
 +                              birthMonth = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-month", 256).trim());
 +                              birthYear = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-year", 256).trim());
 +                              profile.setFirstName(firstName.length() > 0 ? firstName : null);
 +                              profile.setMiddleName(middleName.length() > 0 ? middleName : null);
 +                              profile.setLastName(lastName.length() > 0 ? lastName : null);
 +                              profile.setBirthDay(birthDay).setBirthMonth(birthMonth).setBirthYear(birthYear);
                                currentSone.setProfile(profile);
 +                              throw new RedirectException("index.html");
                        }
 -                      throw new RedirectException("index.html");
                }
-               template.set("firstName", firstName);
-               template.set("middleName", middleName);
-               template.set("lastName", lastName);
-               template.set("birthDay", birthDay);
-               template.set("birthMonth", birthMonth);
-               template.set("birthYear", birthYear);
+               dataProvider.set("firstName", firstName);
+               dataProvider.set("middleName", middleName);
+               dataProvider.set("lastName", lastName);
+               dataProvider.set("birthDay", birthDay);
+               dataProvider.set("birthMonth", birthMonth);
+               dataProvider.set("birthYear", birthYear);
        }
  
  }