Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2

This commit is contained in:
Keir Nellyer 2016-07-19 16:38:19 +01:00
commit 1c1825710d

View File

@ -247,10 +247,9 @@ function getInvolvedUsers($snapshot, $report)
$involvedUsers = $snapshot->getPlayers(); $involvedUsers = $snapshot->getPlayers();
$involvedUsers[$report->getSuspect()->getId()] = $report->getSuspect(); $involvedUsers[$report->getSuspect()->getId()] = $report->getSuspect();
/** @var UserReport $reporter */
foreach ($report->getReporters() as $reporterReason) { foreach ($report->getReporters() as $reporterReason) {
$reporter = $reporterReason->getUser(); $reporter = $reporterReason->getUser();
$involvedUsers[$reporter->getUser()->getId()] = $reporter; $involvedUsers[$reporter->getId()] = $reporter;
} }
return $involvedUsers; return $involvedUsers;