aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-09-14 17:01:08 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-09-14 17:01:08 -0500
commit8e977544fb6763412e45f84791de8c3eccf321c9 (patch)
tree86a3101c9ef934f7358b22f9d6fd40afb6e98503
parented1ec8e720a7ec3c1270cd631cc37e531f315f26 (diff)
downloadforums-8e977544fb6763412e45f84791de8c3eccf321c9.tar
forums-8e977544fb6763412e45f84791de8c3eccf321c9.tar.gz
forums-8e977544fb6763412e45f84791de8c3eccf321c9.tar.bz2
forums-8e977544fb6763412e45f84791de8c3eccf321c9.tar.xz
forums-8e977544fb6763412e45f84791de8c3eccf321c9.zip
[ticket/11103] Normalization of $phpbb_notifications variable name
Use $phpbb_notifications instead of $notifications everywhere for consistency and conflict prevention. PHPBB3-11103
Diffstat
-rw-r--r--phpBB/includes/functions.php14
-rw-r--r--phpBB/includes/functions_admin.php8
-rw-r--r--phpBB/includes/functions_posting.php10
-rw-r--r--phpBB/includes/functions_privmsgs.php4
-rw-r--r--phpBB/includes/mcp/mcp_queue.php6
5 files changed, 21 insertions, 21 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index aec7759f19..b7243227bd 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1294,8 +1294,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
// Mark all forums read (index page)
// Mark all topic notifications read for this user
- $notifications = $phpbb_container->get('notifications');
- $notifications->mark_notifications_read('topic', false, $user->data['user_id'], $post_time);
+ $phpbb_notifications = $phpbb_container->get('notifications');
+ $phpbb_notifications->mark_notifications_read('topic', false, $user->data['user_id'], $post_time);
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
@@ -1336,8 +1336,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
}
// Mark topic notifications read for this user in this forum
- $notifications = $phpbb_container->get('notifications');
- $notifications->mark_notifications_read_by_parent('topic', $forum_id, $user->data['user_id'], $post_time);
+ $phpbb_notifications = $phpbb_container->get('notifications');
+ $phpbb_notifications->mark_notifications_read_by_parent('topic', $forum_id, $user->data['user_id'], $post_time);
// Mark all post/quote notifications read for this user in this forum
$topic_ids = array();
@@ -1351,7 +1351,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
}
$db->sql_freeresult($result);
- $notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_ids, $user->data['user_id'], $post_time);
+ $phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_ids, $user->data['user_id'], $post_time);
// Add 0 to forums array to mark global announcements correctly
// $forum_id[] = 0;
@@ -1448,8 +1448,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
}
// Mark post notifications read for this user in this topic
- $notifications = $phpbb_container->get('notifications');
- $notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_id, $user->data['user_id'], $post_time);
+ $phpbb_notifications = $phpbb_container->get('notifications');
+ $phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_id, $user->data['user_id'], $post_time);
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 6845ae14e3..1cbd44e97e 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -717,8 +717,8 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
}
// Delete notifications
- $notifications = $phpbb_container->get('notifications');
- $notifications->delete_notifications('topic', $topic_ids);
+ $phpbb_notifications = $phpbb_container->get('notifications');
+ $phpbb_notifications->delete_notifications('topic', $topic_ids);
return $return;
}
@@ -899,8 +899,8 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
}
// Delete notifications
- $notifications = $phpbb_container->get('notifications');
- $notifications->delete_notifications('post', $post_ids);
+ $phpbb_notifications = $phpbb_container->get('notifications');
+ $phpbb_notifications->delete_notifications('post', $post_ids);
return sizeof($post_ids);
}
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 56f84562f7..e48a2b6bec 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2222,19 +2222,19 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
// Send Notifications
if ($post_approval)
{
- $notifications = $phpbb_container->get('notifications');
+ $phpbb_notifications = $phpbb_container->get('notifications');
switch ($mode)
{
case 'post' :
- $notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
+ $phpbb_notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
'post_username' => $username,
)));
break;
case 'reply' :
case 'quote' :
- $notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
+ $phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
'post_username' => $username,
)));
break;
@@ -2243,12 +2243,12 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
case 'edit_first_post' :
case 'edit' :
case 'edit_last_post' :
- $notifications->update_notifications('topic', array_merge($data, array(
+ $phpbb_notifications->update_notifications('topic', array_merge($data, array(
'post_username' => $username,
'topic_title' => $subject,
)));
- $notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
+ $phpbb_notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
'post_username' => $username,
)));
break;
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 133b6fc9bc..8545cc7ef5 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -879,8 +879,8 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id)
global $db, $user, $phpbb_container;
// Mark the PM as read
- $notifications = $phpbb_container->get('notifications');
- $notifications->mark_notifications_read('pm', $msg_id, $user_id);
+ $phpbb_notifications = $phpbb_container->get('notifications');
+ $phpbb_notifications->mark_notifications_read('pm', $msg_id, $user_id);
$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
SET pm_unread = 0
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 48557192d2..1373829ecf 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -634,19 +634,19 @@ function approve_post($post_id_list, $id, $mode)
// Send out normal user notifications
$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
- $notifications = $phpbb_container->get('notifications');
+ $phpbb_notifications = $phpbb_container->get('notifications');
foreach ($post_info as $post_id => $post_data)
{
if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
{
// Forum Notifications
- $notifications->add_notifications('topic', $post_data);
+ $phpbb_notifications->add_notifications('topic', $post_data);
}
else
{
// Topic Notifications
- $notifications->add_notifications(array('quote', 'bookmark', 'post'), $post_data);
+ $phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $post_data);
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-02 13:37:42 +0000