Always use correct return page.

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

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 (file)
--- 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);
        }
 
        //