makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10684] Refactor $sql_ignore_users array update

Browse source 
PHPBB3-10684
This commit is contained in:
rxu 2012-03-10 00:17:39 +08:00
parent f563647e4b
commit 89a6cb2886
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/includes/functions_posting.php
View file

@ -1214,21 +1214,15 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
'method' => $row['user_notify_type'], 'method' => $row['user_notify_type'],
'allowed' => false 'allowed' => false
); );
// Add users who have been already notified to ignore list
$sql_ignore_users[$row['user_id']] = $row['user_id'];
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
// forum notification is sent to those not already receiving topic notifications // forum notification is sent to those not already receiving topic notifications
if ($topic_notification) if ($topic_notification)
{ {
// Add users who have been already notified to ignore list
if (sizeof($notify_rows))
{
foreach ($notify_rows as $user_id => $row)
{
$sql_ignore_users[$user_id] = $user_id;
}
}
$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber $sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
FROM ' . FORUMS_WATCH_TABLE . ' fw, ' . USERS_TABLE . " u FROM ' . FORUMS_WATCH_TABLE . ' fw, ' . USERS_TABLE . " u
WHERE fw.forum_id = $forum_id WHERE fw.forum_id = $forum_id
@ -1272,7 +1266,6 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
} }
} }
// Now, we have to do a little step before really sending, we need to distinguish our users a little bit. ;) // Now, we have to do a little step before really sending, we need to distinguish our users a little bit. ;)
$msg_users = $delete_ids = $update_notification = array(); $msg_users = $delete_ids = $update_notification = array();
foreach ($notify_rows as $user_id => $row) foreach ($notify_rows as $user_id => $row)