X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=496fb60a77b4104f37abe95aab782fb726d8f5aa;hb=6db033602e7c17efc40a4a19efe705d67832fc1a;hp=16469353f86e5524d402de2f7360a53d027e84b1;hpb=8b624d6a20adab83f419605d9facfcfe677359ad;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index 1646935..496fb60 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -73,7 +73,7 @@ public class SoneTemplatePage extends TemplatePage {
 	 *            Whether this page requires a login
 	 */
 	public SoneTemplatePage(String path, Template template, String pageTitleKey, WebInterface webInterface, boolean requireLogin) {
-		super(path, template, webInterface.l10n(), pageTitleKey, "noPermission.html");
+		super(path, template, webInterface.getL10n(), pageTitleKey, "noPermission.html");
 		this.webInterface = webInterface;
 		this.requireLogin = requireLogin;
 		template.set("webInterface", webInterface);
@@ -109,15 +109,11 @@ public class SoneTemplatePage extends TemplatePage {
 	 *         session
 	 */
 	protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
-		try {
-			Session session = webInterface.getSessionManager().useSession(toadletContenxt);
-			if (create && (session == null)) {
-				session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
-			}
-			return session;
-		} catch (freenet.clients.http.RedirectException re1) {
-			return null;
+		Session session = webInterface.getSessionManager().useSession(toadletContenxt);
+		if (create && (session == null)) {
+			session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
 		}
+		return session;
 	}
 
 	/**
@@ -137,12 +133,7 @@ public class SoneTemplatePage extends TemplatePage {
 		if (soneId == null) {
 			return null;
 		}
-		for (Sone sone : webInterface.core().getSones()) {
-			if (sone.getId().equals(soneId)) {
-				return sone;
-			}
-		}
-		return null;
+		return webInterface.getCore().getLocalSone(soneId, false);
 	}
 
 	/**