diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-02 16:39:53 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-02 16:39:53 +0100 |
| commit | 0c96873e731acee531748bad142cf852fdd1d30f (patch) | |
| tree | 2814ac785c7241f39c3d74ba85603c358eb84b96 /phpBB | |
| parent | 1639cb93a85c60376134ffc0db3d7557a7684abd (diff) | |
| parent | c60caace5dff459599e4385d27362fedd20be5d6 (diff) | |
| download | forums-0c96873e731acee531748bad142cf852fdd1d30f.tar forums-0c96873e731acee531748bad142cf852fdd1d30f.tar.gz forums-0c96873e731acee531748bad142cf852fdd1d30f.tar.bz2 forums-0c96873e731acee531748bad142cf852fdd1d30f.tar.xz forums-0c96873e731acee531748bad142cf852fdd1d30f.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 7eb4f29109..a54d753787 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -889,7 +889,8 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id) SET pm_unread = 0 WHERE msg_id = $msg_id AND user_id = $user_id - AND folder_id = $folder_id"; + AND folder_id = $folder_id + AND pm_unread = 1"; $db->sql_query($sql); // If the message is already marked as read, we just skip the rest to avoid negative PM count |