Get current user from session correctly.

[demoscenemusic.git] / src / main / java / net / pterodactylus / demoscenemusic / page / BasePage.java

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/page/BasePage.java b/src/main/java/net/pterodactylus/demoscenemusic/page/BasePage.java
index 2e5462a..c24e6af 100644 (file)
--- a/src/main/java/net/pterodactylus/demoscenemusic/page/BasePage.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/page/BasePage.java
@@ -19,7 +19,9 @@ package net.pterodactylus.demoscenemusic.page;
 
 import net.pterodactylus.demoscenemusic.core.Core;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.template.TemplateContextFactory;
+import net.pterodactylus.util.web.RedirectException;
 import net.pterodactylus.util.web.TemplatePage;
 
 /**
@@ -38,7 +40,7 @@ public class BasePage extends TemplatePage<ServletRequest> {
         * @param template
         */
        public BasePage(Core core, TemplateContextFactory templateContextFactory, Template template, String pageName) {
-               super(pageName, "text/html", templateContextFactory, template);
+               super(pageName, "text/html; charset=utf-8", templateContextFactory, template);
                this.core = core;
        }
 
@@ -49,4 +51,13 @@ public class BasePage extends TemplatePage<ServletRequest> {
                return core;
        }
 
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected void processTemplate(TemplateContext templateContext, ServletRequest request) throws RedirectException {
+               super.processTemplate(templateContext, request);
+               templateContext.set("currentUser", request.getServletRequest().getSession().getAttribute("currentUser"));
+       }
+
 }