diff options
| author | Bart van Bragt <bartvb@users.sourceforge.net> | 2005-01-28 11:38:16 +0000 |
|---|---|---|
| committer | Bart van Bragt <bartvb@users.sourceforge.net> | 2005-01-28 11:38:16 +0000 |
| commit | e15083f451273ebc83a8a6cdbf38e51242dabb72 (patch) | |
| tree | 8f9d8eb9aa37d30734b39b4d6a14c1cdb152c64b /phpBB/includes/functions_privmsgs.php | |
| parent | b57ccb8cb9c597f14e9650ae3ef18afd13c1bd38 (diff) | |
| download | forums-e15083f451273ebc83a8a6cdbf38e51242dabb72.tar forums-e15083f451273ebc83a8a6cdbf38e51242dabb72.tar.gz forums-e15083f451273ebc83a8a6cdbf38e51242dabb72.tar.bz2 forums-e15083f451273ebc83a8a6cdbf38e51242dabb72.tar.xz forums-e15083f451273ebc83a8a6cdbf38e51242dabb72.zip | |
Only send PM notification if the user wants to receive one
git-svn-id: file:///svn/phpbb/trunk@5084 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 73171f318f..640f9550aa 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1367,7 +1367,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message) $recipient_list = implode(', ', array_keys($recipients)); - $sql = 'SELECT user_id, username, user_email, user_lang, user_notify_type, user_jabber + $sql = 'SELECT user_id, username, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber FROM ' . USERS_TABLE . " WHERE user_id IN ($recipient_list)"; $result = $db->sql_query($sql); @@ -1375,7 +1375,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message) $msg_list_ary = array(); while ($row = $db->sql_fetchrow($result)) { - if (trim($row['user_email'])) + if ($row['user_notify_pm'] == 1 && trim($row['user_email'])) { $msg_list_ary[] = array( 'method' => $row['user_notify_type'], |