Merge pull request #6645 from nextcloud/backport/5859/stable29
[stable29] Update TrelloJsonService.php
This commit is contained in:
@@ -133,7 +133,7 @@ class TrelloJsonService extends ABoardImportService {
|
|||||||
$cardId = $this->cards[$trelloCard->id]->getId();
|
$cardId = $this->cards[$trelloCard->id]->getId();
|
||||||
$comment = new Comment();
|
$comment = new Comment();
|
||||||
if (!empty($this->getImportService()->getConfig('uidRelation')->{$trelloComment->memberCreator->username})) {
|
if (!empty($this->getImportService()->getConfig('uidRelation')->{$trelloComment->memberCreator->username})) {
|
||||||
$actor = $this->getImportService()->getConfig('uidRelation')->{$trelloComment->memberCreator->username}->getUID();
|
$actor = $this->getImportService()->getConfig('uidRelation')->{$trelloComment->memberCreator->username};
|
||||||
} else {
|
} else {
|
||||||
$actor = $this->getImportService()->getConfig('owner')->getUID();
|
$actor = $this->getImportService()->getConfig('owner')->getUID();
|
||||||
}
|
}
|
||||||
@@ -361,7 +361,7 @@ class TrelloJsonService extends ABoardImportService {
|
|||||||
|
|
||||||
private function replaceUsernames(string $text): string {
|
private function replaceUsernames(string $text): string {
|
||||||
foreach ($this->getImportService()->getConfig('uidRelation') as $trello => $nextcloud) {
|
foreach ($this->getImportService()->getConfig('uidRelation') as $trello => $nextcloud) {
|
||||||
$text = str_replace($trello, $nextcloud->getUID(), $text);
|
$text = str_replace($trello, $nextcloud, $text);
|
||||||
}
|
}
|
||||||
return $text;
|
return $text;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user