From: Joshua Rüsweg <josh@bastelstu.be>
Date: Tue, 7 Aug 2018 13:16:12 +0000 (+0200)
Subject: Copy explicit joins from pseudo user list
X-Git-Tag: 5.2.0_Alpha_1~364^2~102^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2829258ecc00bf8e0f32386209d81f61404a9d0b;p=GitHub%2FWoltLab%2FWCF.git

Copy explicit joins from pseudo user list
See #2665
---

diff --git a/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php b/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
index ac4dd048aa..4f060da0d0 100644
--- a/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
@@ -149,6 +149,7 @@ class TrophyConditionHandler extends SingletonFactory {
 		$userList = new UserList();
 		$userList->sqlConditionJoins = $pseudoUserList->sqlConditionJoins;
 		$userList->sqlOrderBy = $pseudoUserList->sqlOrderBy;
+		$userList->sqlJoins = $pseudoUserList->sqlJoins;
 		$userList->sqlJoins .= " LEFT JOIN wcf".WCF_N."_user_trophy user_trophy ON (user_table.userID = user_trophy.userID)";
 		$userList->useQualifiedShorthand = false;
 		$userList->sqlSelects = "user_trophy.userTrophyID, user_table.userID";