From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 19 Dec 2012 16:22:49 +0000 (+0100)
Subject: Merge branch 'fix-avatar-selection-309' into next
X-Git-Tag: 0.8.5^2~11^2
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=4a0c67e05ac11c36484cbea260a5c94a7e63175f;hp=a90c83da842c28f0e045d8a09dd3480643cd87f1

Merge branch 'fix-avatar-selection-309' into next
---

diff --git a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
index a1b759b..51a72b8 100644
--- a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
@@ -77,7 +77,7 @@ public class EditProfilePage extends SoneTemplatePage {
 				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());
-				avatarId = request.getHttpRequest().getPartAsStringFailsafe("avatar-id", 36);
+				avatarId = request.getHttpRequest().getPartAsStringFailsafe("avatarId", 36);
 				profile.setFirstName(firstName.length() > 0 ? firstName : null);
 				profile.setMiddleName(middleName.length() > 0 ? middleName : null);
 				profile.setLastName(lastName.length() > 0 ? lastName : null);
@@ -139,7 +139,7 @@ public class EditProfilePage extends SoneTemplatePage {
 		templateContext.set("birthDay", birthDay);
 		templateContext.set("birthMonth", birthMonth);
 		templateContext.set("birthYear", birthYear);
-		templateContext.set("avatar-id", avatarId);
+		templateContext.set("avatarId", avatarId);
 		templateContext.set("fields", fields);
 	}
 
diff --git a/src/main/resources/templates/editProfile.html b/src/main/resources/templates/editProfile.html
index f0b8b56..ddc08a9 100644
--- a/src/main/resources/templates/editProfile.html
+++ b/src/main/resources/templates/editProfile.html
@@ -186,12 +186,12 @@
 
 		<ul id="avatar-selection">
 			<li id="no-avatar">
-				<input type="radio" name="avatar-id" value="none"<%ifnull avatar-id> checked="checked"<%/if>/>
+				<input type="radio" name="avatarId" value="none"<%ifnull avatarId> checked="checked"<%/if>/>
 				<%= Page.EditProfile.Avatar.Delete|l10n|html>
 			</li>
 			<%foreach currentSone.allImages image>
 				<li>
-					<input type="radio" name="avatar-id" value="<%image.id|html>"<%if avatar-id|match key=image.id> checked="checked"<%/if>/>
+					<input type="radio" name="avatarId" value="<%image.id|html>"<%if avatarId|match value=image.id> checked="checked"<%/if>/>
 					<div class="post-avatar"><% image|image-link max-width==48 max-height==48 mode==enlarge title=image.title></div>
 				</li>
 			<%/foreach>