From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 7 Jul 2011 18:51:22 +0000 (+0200)
Subject: Store Sone under a different name to prevent it from being clobbered.
X-Git-Tag: 0.6.6^2~26
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=6ceda699ed09af534cfb6c4dd1dc95c476d135b7;p=Sone.git

Store Sone under a different name to prevent it from being clobbered.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 9c96c3e..0e62f77 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -712,7 +712,7 @@ public class WebInterface implements CoreListener {
 			TemplateNotification templateNotification = soneInsertNotifications.get(sone);
 			if (templateNotification == null) {
 				templateNotification = new TemplateNotification(TemplateParser.parse(createReader("/templates/notify/soneInsertNotification.html")));
-				templateNotification.set("sone", sone);
+				templateNotification.set("insertSone", sone);
 				soneInsertNotifications.put(sone, templateNotification);
 			}
 			return templateNotification;
diff --git a/src/main/resources/templates/notify/soneInsertNotification.html b/src/main/resources/templates/notify/soneInsertNotification.html
index 8d3260d..27374ad 100644
--- a/src/main/resources/templates/notify/soneInsertNotification.html
+++ b/src/main/resources/templates/notify/soneInsertNotification.html
@@ -1,7 +1,7 @@
 <%if soneStatus|match value="inserting">
-	Your Sone <a href="viewSone.html?sone=<%sone.id|html>"><%sone.niceName|html></a> is now being inserted.
+	Your Sone <a href="viewSone.html?sone=<%insertSone.id|html>"><%insertSone.niceName|html></a> is now being inserted.
 <%elseif soneStatus|match value="inserted">
-	Your Sone <a href="viewSone.html?sone=<%sone.id|html>"><%sone.niceName|html></a> has been inserted in <%= Notification.SoneInsert.Duration|l10n 0=insertDuration>.
+	Your Sone <a href="viewSone.html?sone=<%insertSone.id|html>"><%insertSone.niceName|html></a> has been inserted in <%= Notification.SoneInsert.Duration|l10n 0=insertDuration>.
 <%elseif soneStatus|match value="insert-aborted">
-	Inserting your Sone <a href="viewSone.html?sone=<%sone.id|html>"><%sone.niceName|html></a> has failed.
+	Inserting your Sone <a href="viewSone.html?sone=<%insertSone.id|html>"><%insertSone.niceName|html></a> has failed.
 <%/if>
\ No newline at end of file