From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 19 Oct 2010 20:58:42 +0000 (+0200)
Subject: Always use correct return page.
X-Git-Tag: 0.1-RC1~171
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=eb1da279d8ecc07c1f68a42da2cd16a0469c08f5;p=Sone.git

Always use correct return page.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
index 05aceac..2878f1c 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
@@ -51,19 +51,17 @@ public class CreatePostPage extends SoneTemplatePage {
 	@Override
 	protected void processTemplate(Request request, Template template) throws RedirectException {
 		super.processTemplate(request, template);
-		template.set("returnPage", request.getUri());
+		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
 		if (request.getMethod() == Method.POST) {
 			String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
-			String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
 			if (text.length() != 0) {
 				Sone currentSone = getCurrentSone(request.getToadletContext());
 				webInterface.core().createPost(currentSone, System.currentTimeMillis(), text);
 				throw new RedirectException(returnPage);
 			}
 			template.set("errorTextEmpty", true);
-			template.set("returnPage", returnPage);
 		}
-
+		template.set("returnPage", returnPage);
 	}
 
 	//