Merge branch 'release/0.9-rc1'

[Sone.git] / src / main / java / net / pterodactylus / sone / web / DeleteAlbumPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
index 3dfb8b4..98e8909 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
@@ -50,7 +50,7 @@ public class DeleteAlbumPage extends SoneTemplatePage {
                super.processTemplate(request, templateContext);
                if (request.getMethod() == Method.POST) {
                        String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
-                       Album album = webInterface.getCore().getAlbum(albumId, false);
+                       Album album = webInterface.getCore().getAlbum(albumId);
                        if (album == null) {
                                throw new RedirectException("invalid.html");
                        }
@@ -62,13 +62,13 @@ public class DeleteAlbumPage extends SoneTemplatePage {
                        }
                        Album parentAlbum = album.getParent();
                        webInterface.getCore().deleteAlbum(album);
-                       if (parentAlbum == null) {
+                       if (parentAlbum.equals(album.getSone().getRootAlbum())) {
                                throw new RedirectException("imageBrowser.html?sone=" + album.getSone().getId());
                        }
                        throw new RedirectException("imageBrowser.html?album=" + parentAlbum.getId());
                }
                String albumId = request.getHttpRequest().getParam("album");
-               Album album = webInterface.getCore().getAlbum(albumId, false);
+               Album album = webInterface.getCore().getAlbum(albumId);
                if (album == null) {
                        throw new RedirectException("invalid.html");
                }