X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUploadImagePage.java;h=06afa8c608c8a500c900730c068a1a4dc27816e4;hb=28b0c5550f1a2c1009f62ba43a038f2f2a878781;hp=2b252634d7f2a9c4e5174ab3be43a325a457b912;hpb=77baeade882c7d936b7293a35303d824ae183994;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index 2b25263..06afa8c 100644
--- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@ -70,7 +70,7 @@ public class UploadImagePage extends SoneTemplatePage {
 			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
 			Album parent = webInterface.getCore().getAlbum(parentId, false);
 			if (parent == null) {
-				throw new RedirectException("invalid.html");
+				return;
 			}
 			String name = request.getHttpRequest().getPartAsStringFailsafe("title", 200);
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 4000);
@@ -82,7 +82,8 @@ public class UploadImagePage extends SoneTemplatePage {
 				imageInputStream = fileBucket.getInputStream();
 				Image uploadedImage = ImageIO.read(imageInputStream);
 				if (uploadedImage == null) {
-					throw new RedirectException("invalid.html");
+					templateContext.set("messages", webInterface.getL10n().getString("Page.UploadImage.Error.InvalidImage"));
+					return;
 				}
 				image = new net.pterodactylus.sone.data.Image().setSone(currentSone);
 				image.setTitle(name).setDescription(description).setWidth(uploadedImage.getWidth(null)).setHeight(uploadedImage.getHeight(null));
@@ -90,7 +91,7 @@ public class UploadImagePage extends SoneTemplatePage {
 				uploadedImage.flush();
 			} catch (IOException ioe1) {
 				logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
-				throw new RedirectException("invalid.html");
+				return;
 			} finally {
 				Closer.close(imageInputStream);
 				fileBucket.free();