From 9e90dd7473b5a4107db9ef1ce0a258cb174328ea Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 8 Aug 2016 16:27:13 +0200
Subject: [PATCH] Resolved some todos / removed obsolete todos

---
 .../templates/boxRecentActivity.tpl            |  2 +-
 com.woltlab.wcf/userGroupOption.xml            |  1 -
 wcfsetup/install/files/js/WCF.User.js          |  9 +++------
 .../lib/data/article/LikeableArticle.class.php | 18 ------------------
 .../SearchResultArticleContent.class.php       |  1 -
 .../install/files/lib/data/page/Page.class.php |  1 -
 6 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/com.woltlab.wcf/templates/boxRecentActivity.tpl b/com.woltlab.wcf/templates/boxRecentActivity.tpl
index 800835226e..c488a57f35 100644
--- a/com.woltlab.wcf/templates/boxRecentActivity.tpl
+++ b/com.woltlab.wcf/templates/boxRecentActivity.tpl
@@ -2,7 +2,7 @@
 	<header class="sectionHeader">
 		<h2 class="sectionTitle">{lang}wcf.user.recentActivity{/lang}</h2>
 		
-		{if $canFilterByFollowedUsers}{*todo*}
+		{if $canFilterByFollowedUsers}
 			<nav class="jsMobileNavigation buttonGroupNavigation jsOnly jsRecentActivitySwitchContext">
 				<ul class="buttonGroup">
 					<li><a href="#" class="button small{if !$filteredByFollowedUsers} active{/if}">{lang}wcf.user.recentActivity.scope.all{/lang}</a></li>
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 0f80d192a8..d45deb9f76 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -841,7 +841,6 @@ png</defaultvalue>
 			</option>
 			<!-- /user.profileComment -->
 			
-			<!-- todo: find better category -->
 			<option name="user.tag.canViewTag">
 				<categoryname>user.message</categoryname>
 				<optiontype>boolean</optiontype>
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index a150c34780..fe638c29a8 100644
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -1719,13 +1719,11 @@ WCF.User.RecentActivityLoader = Class.extend({
 		});
 		
 		if (this._container.children('li').length) {
-			// todo: remove recentActivitiesMore in 3.0
-			this._loadButton = $('<li class="recentActivitiesMore showMore"><button class="small">' + WCF.Language.get('wcf.user.recentActivity.more') + '</button></li>').appendTo(this._container);
+			this._loadButton = $('<li class="showMore"><button class="small">' + WCF.Language.get('wcf.user.recentActivity.more') + '</button></li>').appendTo(this._container);
 			this._loadButton = this._loadButton.children('button').click($.proxy(this._click, this));
 		}
 		else {
-			// todo: remove recentActivitiesMore in 3.0
-			$('<li class="recentActivitiesMore showMore"><small>' + WCF.Language.get('wcf.user.recentActivity.noMoreEntries') + '</small></li>').appendTo(this._container);
+			$('<li class="showMore"><small>' + WCF.Language.get('wcf.user.recentActivity.noMoreEntries') + '</small></li>').appendTo(this._container);
 		}
 		
 		if (WCF.User.userID) {
@@ -1868,8 +1866,7 @@ WCF.User.LikeLoader = Class.extend({
 			success: $.proxy(this._success, this)
 		});
 		
-		// todo: remove recentActivitiesMore in 3.0
-		var $container = $('<li class="likeListMore recentActivitiesMore showMore"><button class="small">' + WCF.Language.get('wcf.like.likes.more') + '</button><small>' + WCF.Language.get('wcf.like.likes.noMoreEntries') + '</small></li>').appendTo(this._container);
+		var $container = $('<li class="likeListMore showMore"><button class="small">' + WCF.Language.get('wcf.like.likes.more') + '</button><small>' + WCF.Language.get('wcf.like.likes.noMoreEntries') + '</small></li>').appendTo(this._container);
 		this._loadButton = $container.children('button').click($.proxy(this._click, this));
 		this._noMoreEntries = $container.children('small').hide();
 		
diff --git a/wcfsetup/install/files/lib/data/article/LikeableArticle.class.php b/wcfsetup/install/files/lib/data/article/LikeableArticle.class.php
index cc99ab4304..8934374c4b 100644
--- a/wcfsetup/install/files/lib/data/article/LikeableArticle.class.php
+++ b/wcfsetup/install/files/lib/data/article/LikeableArticle.class.php
@@ -59,24 +59,6 @@ class LikeableArticle extends AbstractLikeObject {
 		$editor->update(['cumulativeLikes' => $cumulativeLikes]);
 	}
 	
-	/**
-	 * @inheritDoc
-	 */
-	public function sendNotification(Like $like) {
-		/* @todo
-		if ($this->getDecoratedObject()->userID != WCF::getUser()->userID) {
-			$notificationObject = new LikeUserNotificationObject($like);
-			UserNotificationHandler::getInstance()->fireEvent(
-				'like',
-				'com.woltlab.wcf.likeableArticle.notification',
-				$notificationObject,
-				[$this->getDecoratedObject()->userID],
-				['objectID' => $this->getDecoratedObject()->articleID]
-			);
-		}
-		*/
-	}
-	
 	/** @noinspection PhpMissingParentCallCommonInspection */
 	/**
 	 * @inheritDoc
diff --git a/wcfsetup/install/files/lib/data/article/content/SearchResultArticleContent.class.php b/wcfsetup/install/files/lib/data/article/content/SearchResultArticleContent.class.php
index 9fd10b70f2..ae0ac127bd 100644
--- a/wcfsetup/install/files/lib/data/article/content/SearchResultArticleContent.class.php
+++ b/wcfsetup/install/files/lib/data/article/content/SearchResultArticleContent.class.php
@@ -62,7 +62,6 @@ class SearchResultArticleContent extends ViewableArticleContent implements ISear
 	 * @inheritDoc
 	 */
 	public function getFormattedMessage() {
-		// @todo
 		$message = SearchResultTextParser::getInstance()->parse($this->getDecoratedObject()->getFormattedContent());
 		
 		if ($this->getImage()) {
diff --git a/wcfsetup/install/files/lib/data/page/Page.class.php b/wcfsetup/install/files/lib/data/page/Page.class.php
index cd0203d085..0aaf10d4e8 100644
--- a/wcfsetup/install/files/lib/data/page/Page.class.php
+++ b/wcfsetup/install/files/lib/data/page/Page.class.php
@@ -146,7 +146,6 @@ class Page extends DatabaseObject implements ILinkableObject, ITitledObject {
 	 */
 	public function getLink() {
 		if ($this->controller) {
-			// todo: use a unified method for this
 			$controllerParts = explode('\\', $this->controller);
 			$controllerName = $controllerParts[count($controllerParts) - 1];
 			$controllerName = preg_replace('/(page|action|form)$/i', '', $controllerName);
-- 
2.20.1