From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 1 Jul 2016 14:10:39 +0000 (+0200)
Subject: Merge branch 'refs/heads/pr/2008' into next
X-Git-Tag: 3.0.0_Beta_1~1288
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=173e275a1e1686f92ed1bb148ae30819627e5914;p=GitHub%2FWoltLab%2FWCF.git

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

# Conflicts:

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

173e275a1e1686f92ed1bb148ae30819627e5914
diff --cc wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php
index 0ba22e3990,3c8edbb4ed..2f631d54c4
--- a/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');
  	}
  	
  	/**