X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeleteAlbumPage.java;h=6855e3813475840efa6934a819d7f648995ffe4a;hp=b7c7267352c88c1a4c493907496f5d9bc9927742;hb=bf6507766c997f89bb2415e837fc11ba01829433;hpb=bbed3c23f95b429664e38711dcd33caf06e23a55

diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
index b7c7267..6855e38 100644
--- a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
@@ -56,6 +56,9 @@ public class DeleteAlbumPage extends SoneTemplatePage {
 			if (!webInterface.getCore().isLocalSone(album.getSone())) {
 				throw new RedirectException("noPermission.html");
 			}
+			if (request.getHttpRequest().isPartSet("abortDelete")) {
+				throw new RedirectException("imageBrowser.html?album=" + album.getId());
+			}
 			Album parentAlbum = album.getParent();
 			webInterface.getCore().deleteAlbum(album);
 			if (parentAlbum == null) {
@@ -63,6 +66,12 @@ public class DeleteAlbumPage extends SoneTemplatePage {
 			}
 			throw new RedirectException("imageBrowser.html?album=" + parentAlbum.getId());
 		}
+		String albumId = request.getHttpRequest().getParam("album");
+		Album album = webInterface.getCore().getAlbum(albumId, false);
+		if (album == null) {
+			throw new RedirectException("invalid.html");
+		}
+		templateContext.set("album", album);
 	}
 
 }