Store Sone under a different name to prevent it from being clobbered.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 7 Jul 2011 18:51:22 +0000 (20:51 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 7 Jul 2011 18:51:22 +0000 (20:51 +0200)
src/main/java/net/pterodactylus/sone/web/WebInterface.java
src/main/resources/templates/notify/soneInsertNotification.html

index 9c96c3e..0e62f77 100644 (file)
@@ -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;
index 8d3260d..27374ad 100644 (file)
@@ -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