X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=b7e32871b7da4336fc8d0b4c43535401ca7db4fb;hb=f9b5addb5d0e7a080e9f314cf6712143f5e26060;hp=cabc44e0f8702f39089a847b39ef8fa3f05fc0dd;hpb=8ee3de9a7ed7c65b5f695dd60da6e55d94c1125e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index cabc44e..b7e3287 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - WebInterface.java - Copyright © 2010–2015 David Roden
+ * Sone - WebInterface.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -717,7 +717,7 @@ public class WebInterface {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(emptyTemplate, this), "Logout"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new RescuePage(rescueTemplate, this), "Rescue"));
-		pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.VERSION, SonePlugin.getYear(), SonePlugin.getHomepage()), "About"));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.getPluginVersion(), SonePlugin.getYear(), SonePlugin.getHomepage()), "About"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("emptyImageTitle.html", emptyImageTitleTemplate, "Page.EmptyImageTitle.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("emptyAlbumTitle.html", emptyAlbumTitleTemplate, "Page.EmptyAlbumTitle.Title", this)));
@@ -793,7 +793,7 @@ public class WebInterface {
 	private Collection<Sone> getMentionedSones(String text) {
 		/* we need no context to find mentioned Sones. */
 		Set<Sone> mentionedSones = new HashSet<Sone>();
-		for (Part part : soneTextParser.parse(null, text)) {
+		for (Part part : soneTextParser.parse(text, null)) {
 			if (part instanceof SonePart) {
 				mentionedSones.add(((SonePart) part).getSone());
 			}
@@ -933,12 +933,6 @@ public class WebInterface {
 	@Subscribe
 	public void soneRemoved(SoneRemovedEvent soneRemovedEvent) {
 		newSoneNotification.remove(soneRemovedEvent.sone());
-		for (Post post : soneRemovedEvent.sone().getPosts()) {
-			removePost(post);
-		}
-		for (PostReply postReply : soneRemovedEvent.sone().getReplies()) {
-			removeReply(postReply);
-		}
 	}
 
 	@Subscribe