mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-29 04:50:51 +02:00
[ticket/12990] Use the full services name for the notification's types
PHPBB3-12990
This commit is contained in:
@@ -883,7 +883,7 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id)
|
||||
|
||||
$phpbb_notifications = $phpbb_container->get('notification_manager');
|
||||
|
||||
$phpbb_notifications->mark_notifications_read('pm', $msg_id, $user_id);
|
||||
$phpbb_notifications->mark_notifications_read('notification.type.pm', $msg_id, $user_id);
|
||||
|
||||
$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
|
||||
SET pm_unread = 0
|
||||
@@ -1114,7 +1114,7 @@ function delete_pm($user_id, $msg_ids, $folder_id)
|
||||
|
||||
$phpbb_notifications = $phpbb_container->get('notification_manager');
|
||||
|
||||
$phpbb_notifications->delete_notifications('pm', array_keys($delete_rows));
|
||||
$phpbb_notifications->delete_notifications('notification.type.pm', array_keys($delete_rows));
|
||||
|
||||
// Now we have to check which messages we can delete completely
|
||||
$sql = 'SELECT msg_id
|
||||
@@ -1296,7 +1296,7 @@ function phpbb_delete_users_pms($user_ids)
|
||||
AND ' . $db->sql_in_set('msg_id', $delivered_msg);
|
||||
$db->sql_query($sql);
|
||||
|
||||
$phpbb_notifications->delete_notifications('pm', $delivered_msg);
|
||||
$phpbb_notifications->delete_notifications('notification.type.pm', $delivered_msg);
|
||||
}
|
||||
|
||||
if (!empty($undelivered_msg))
|
||||
@@ -1309,7 +1309,7 @@ function phpbb_delete_users_pms($user_ids)
|
||||
WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
|
||||
$db->sql_query($sql);
|
||||
|
||||
$phpbb_notifications->delete_notifications('pm', $undelivered_msg);
|
||||
$phpbb_notifications->delete_notifications('notification.type.pm', $undelivered_msg);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1353,7 +1353,7 @@ function phpbb_delete_users_pms($user_ids)
|
||||
WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
|
||||
$db->sql_query($sql);
|
||||
|
||||
$phpbb_notifications->delete_notifications('pm', $delete_ids);
|
||||
$phpbb_notifications->delete_notifications('notification.type.pm', $delete_ids);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1911,11 +1911,11 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
|
||||
|
||||
if ($mode == 'edit')
|
||||
{
|
||||
$phpbb_notifications->update_notifications('pm', $pm_data);
|
||||
$phpbb_notifications->update_notifications('notification.type.pm', $pm_data);
|
||||
}
|
||||
else
|
||||
{
|
||||
$phpbb_notifications->add_notifications('pm', $pm_data);
|
||||
$phpbb_notifications->add_notifications('notification.type.pm', $pm_data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user