Merge branch 'main' into develop

develop-unstable
iglocska 2022-12-13 11:00:56 +01:00
commit 1db70114c0
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 4 additions and 4 deletions

View File

@ -140,7 +140,7 @@ class NotifyAdminsBehavior extends Behavior
$entity->id $entity->id
]), ]),
]; ];
$this->notifySiteAdmins($entity->getSource(), $title, $message, $data); $this->notifySiteAdmins($entity->getSource(), $title, $data, $message);
} }
public function notifySiteAdminsForEntityDeletion(EntityInterface $entity): void public function notifySiteAdminsForEntityDeletion(EntityInterface $entity): void
@ -168,7 +168,7 @@ class NotifyAdminsBehavior extends Behavior
$entity->id $entity->id
]), ]),
]; ];
$this->notifySiteAdmins($entity->getSource(), $title, $message, $data); $this->notifySiteAdmins($entity->getSource(), $title, $data, $message);
} }
/** /**
@ -187,8 +187,8 @@ class NotifyAdminsBehavior extends Behavior
public function notifySiteAdmins( public function notifySiteAdmins(
string $origin, string $origin,
string $title, string $title,
string $message = '', array $data,
array $data string $message = ''
): void { ): void {
$this->InboxProcessors = $this->InboxProcessors ?: TableRegistry::getTableLocator()->get('InboxProcessors'); $this->InboxProcessors = $this->InboxProcessors ?: TableRegistry::getTableLocator()->get('InboxProcessors');
$processor = $this->InboxProcessors->getProcessor('Notification', 'DataChange'); $processor = $this->InboxProcessors->getProcessor('Notification', 'DataChange');