From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 6 Jan 2020 14:13:39 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.1~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0286173f528e57ba71182546b6ad817a3ec1297d;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

0286173f528e57ba71182546b6ad817a3ec1297d
diff --cc wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
index 7e190d208e,c70937df67..eff4a7a9ad
--- a/wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/trophy/UserTrophyAction.class.php
@@@ -2,7 -2,7 +2,8 @@@
  namespace wcf\data\user\trophy;
  use wcf\data\user\UserAction;
  use wcf\data\AbstractDatabaseObjectAction;
+ use wcf\data\user\UserProfile;
 +use wcf\data\user\UserProfileAction;
  use wcf\system\cache\runtime\UserProfileRuntimeCache;
  use wcf\system\database\util\PreparedStatementConditionBuilder;
  use wcf\system\exception\IllegalLinkException;