Resolved some todos / removed obsolete todos

diff --git a/com.woltlab.wcf/templates/boxRecentActivity.tpl b/com.woltlab.wcf/templates/boxRecentActivity.tpl
index 800835226e8a8f40e57f168601ed1a6018be75aa..c488a57f354d77e4366b12fb3fc974517d3e585c 100644 (file)
--- 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 0f80d192a81d2ad548417af153190030e7c916be..d45deb9f76d7d142ded0788fac982dd0457c2947 100644 (file)
--- 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 a150c3478001e6f168fb346ec4eedc00e212ef20..fe638c29a89173bbcd491337d95389a06b8c525a 100644 (file)
--- 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 cc99ab4304ebab8baf6f58d4a299ba7eda8f4eaf..8934374c4bb2e1533ae32ccb4a45a334b11b9efd 100644 (file)
--- 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 9fd10b70f225b89abb1a01af242a1a26d83cef3b..ae0ac127bdfa12f282e069f53c700fc7cb3f568b 100644 (file)
--- 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 cd0203d085cb12be52c1bdd4b393c4c208f184c4..0aaf10d4e8ea95d707b1268f390ef94a024af9bc 100644 (file)
--- 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);