X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateAlbumPage.java;h=76a71d6224d8bf942a9b45bca7d1d9706638181c;hb=ec06ae64c86f0b06bb0cf9f8b289e7907e81dffa;hp=9072ea48b192a4b850ca42dc186ad98c83cb9007;hpb=60926d0dc3b2139029c3fcb0b3d28caccf4b83b3;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
index 9072ea4..76a71d6 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - CreateAlbumPage.java - Copyright © 2011 David Roden
+ * Sone - CreateAlbumPage.java - Copyright © 2011–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,9 +63,12 @@ public class CreateAlbumPage extends SoneTemplatePage {
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
 			Sone currentSone = getCurrentSone(request.getToadletContext());
 			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
-			Album parent = webInterface.getCore().getAlbum(parentId, false);
+			Album parent = webInterface.getCore().getAlbum(parentId);
+			if (parentId.equals("")) {
+				parent = currentSone.getRootAlbum();
+			}
 			Album album = webInterface.getCore().createAlbum(currentSone, parent);
-			album.setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
+			album.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			webInterface.getCore().touchConfiguration();
 			throw new RedirectException("imageBrowser.html?album=" + album.getId());
 		}