Merge pull request #10900 from annando/notify
`enotify.php` is removed and its functions were transferred
This commit is contained in:
commit
353cd66b26
10 changed files with 863 additions and 859 deletions
|
@ -2719,7 +2719,7 @@ class Contact
|
|||
if (($user['notify-flags'] & Notification\Type::INTRO) &&
|
||||
in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
|
||||
|
||||
notification([
|
||||
DI::notify()->createFromArray([
|
||||
'type' => Notification\Type::INTRO,
|
||||
'otype' => Notification\ObjectType::INTRO,
|
||||
'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
|
||||
|
|
|
@ -104,7 +104,7 @@ class Mail
|
|||
'link' => DI::baseUrl() . '/message/' . $msg['id'],
|
||||
];
|
||||
|
||||
notification($notif_params);
|
||||
DI::notify()->createFromArray($notif_params);
|
||||
|
||||
Logger::info('Mail is processed, notification was sent.', ['id' => $msg['id'], 'uri' => $msg['uri']]);
|
||||
}
|
||||
|
|
|
@ -154,7 +154,7 @@ class Subscription
|
|||
}
|
||||
|
||||
if ($desktop_notification) {
|
||||
notification_from_array($Notification);
|
||||
DI::notify()->createFromNotification($Notification);
|
||||
}
|
||||
|
||||
if (empty($type)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue