diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-21 00:44:05 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-21 00:44:05 +0200 |
| commit | 31aac66f5aca218254a6ff199c21a282bc6059bc (patch) | |
| tree | 5237ffca00a3f41fd892398f41aa3b3203ce138a /phpBB/includes/functions.php | |
| parent | 421005b28208e91c236a84500f2799a9f6033a03 (diff) | |
| parent | 71f78fb8c6167f33e9e650f97243099fc2bf9a4f (diff) | |
| download | forums-31aac66f5aca218254a6ff199c21a282bc6059bc.tar forums-31aac66f5aca218254a6ff199c21a282bc6059bc.tar.gz forums-31aac66f5aca218254a6ff199c21a282bc6059bc.tar.bz2 forums-31aac66f5aca218254a6ff199c21a282bc6059bc.tar.xz forums-31aac66f5aca218254a6ff199c21a282bc6059bc.zip | |
Merge pull request #2885 from Nicofuma/ticket/12990
[ticket/12990] Use the full services name for the notification's types
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index c838876ddd..3afd08d40f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1146,12 +1146,12 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ // Mark all topic notifications read for this user $phpbb_notifications->mark_notifications_read(array( - 'topic', - 'quote', - 'bookmark', - 'post', - 'approve_topic', - 'approve_post', + 'notification.type.topic', + 'notification.type.quote', + 'notification.type.bookmark', + 'notification.type.post', + 'notification.type.approve_topic', + 'notification.type.approve_post', ), false, $user->data['user_id'], $post_time); if ($config['load_db_lastread'] && $user->data['is_registered']) @@ -1211,8 +1211,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ $phpbb_notifications = $phpbb_container->get('notification_manager'); $phpbb_notifications->mark_notifications_read_by_parent(array( - 'topic', - 'approve_topic', + 'notification.type.topic', + 'notification.type.approve_topic', ), $forum_id, $user->data['user_id'], $post_time); // Mark all post/quote notifications read for this user in this forum @@ -1228,10 +1228,10 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ $db->sql_freeresult($result); $phpbb_notifications->mark_notifications_read_by_parent(array( - 'quote', - 'bookmark', - 'post', - 'approve_post', + 'notification.type.quote', + 'notification.type.bookmark', + 'notification.type.post', + 'notification.type.approve_post', ), $topic_ids, $user->data['user_id'], $post_time); // Add 0 to forums array to mark global announcements correctly @@ -1334,15 +1334,15 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $ // Mark post notifications read for this user in this topic $phpbb_notifications->mark_notifications_read(array( - 'topic', - 'approve_topic', + 'notification.type.topic', + 'notification.type.approve_topic', ), $topic_id, $user->data['user_id'], $post_time); $phpbb_notifications->mark_notifications_read_by_parent(array( - 'quote', - 'bookmark', - 'post', - 'approve_post', + 'notification.type.quote', + 'notification.type.bookmark', + 'notification.type.post', + 'notification.type.approve_post', ), $topic_id, $user->data['user_id'], $post_time); if ($config['load_db_lastread'] && $user->data['is_registered']) |