Merge branch 'refs/heads/pr/2008' into next

# Conflicts:

#	wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php

diff --cc wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php
index 0ba22e3990dbc1238a90e039484e7cf1358260e1,3c8edbb4ed68fc065d12a2ecb8576ff2d0261f40..2f631d54c41a1cf5a19494ee76aea57e3a260b8f
--- 1/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php
--- 2/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php
@@@ -9,9 -9,11 +9,9 @@@ use wcf\system\request\LinkHandler
   * @author    Alexander Ebert
   * @copyright 2001-2016 WoltLab GmbH
   * @license   GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
 - * @package   com.woltlab.wcf
 - * @subpackage        system.user.notification.event
 - * @category  Community Framework
 + * @package   WoltLabSuite\Core\System\User\Notification\Event
   */
- class UserProfileCommentUserNotificationEvent extends AbstractUserNotificationEvent {
+ class UserProfileCommentUserNotificationEvent extends AbstractSharedUserNotificationEvent {
        /**
         * @inheritDoc
         */
@@@ -93,7 -102,9 +100,7 @@@
         * @inheritDoc
         */
        public function getLink() {
-               return LinkHandler::getInstance()->getLink('User', ['id' => $this->userNotificationObject->objectID], '#wall');
 -              $user = UserProfileRuntimeCache::getInstance()->getObject($this->userNotificationObject->objectID);
 -
 -              return LinkHandler::getInstance()->getLink('User', ['object' => $user], '#wall');
++              return LinkHandler::getInstance()->getLink('User', ['object' => UserProfileRuntimeCache::getInstance()->getObject($this->userNotificationObject->objectID)], '#wall');
        }
        
        /**