Skip to content

Commit dc0d9cb

Browse files
authored
Merge pull request #4118 from nextcloud/fix/activity
fix activity stream
2 parents feab22e + 795dbd8 commit dc0d9cb

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

lib/Provider/ActivityProvider.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,21 @@ public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
5353
return $event;
5454
}
5555

56+
private function patchParameters(array $parameters) : array {
57+
// add an ugly fix, because there are some activities that have misconfigured poll references
58+
// the poll can exist as $parameters['poll'] or as $parameters['pollTitle']
59+
// fix it to $parameters['pollTitle'] for consistency
60+
// this to avoid massive translation changes in transifex
61+
62+
if (isset($parameters['poll']) && !isset($parameters['pollTitle'])) {
63+
$parameters['pollTitle'] = $parameters['poll'];
64+
}
65+
66+
return $parameters;
67+
}
68+
5669
protected function setSubjects(IEvent $event, string $subject): void {
57-
$parameters = $event->getSubjectParameters();
70+
$parameters = $this->patchParameters($event->getSubjectParameters());
5871

5972
try {
6073
$actor = $this->userMapper->getParticipant($event->getAuthor(), $event->getObjectId());

0 commit comments

Comments
 (0)