aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-03-26 17:07:20 -0400
committerDavid King <imkingdavid@gmail.com>2013-03-26 17:07:20 -0400
commit6dddc22ec7241cdf32cd28788ff04fb296648203 (patch)
tree417ce5ba7a5316e679b98fceac73e78bfa8a6846 /phpBB/includes
parent8b464e87f0a41422dddaa647ac42ab9c7950bb4b (diff)
downloadforums-6dddc22ec7241cdf32cd28788ff04fb296648203.tar
forums-6dddc22ec7241cdf32cd28788ff04fb296648203.tar.gz
forums-6dddc22ec7241cdf32cd28788ff04fb296648203.tar.bz2
forums-6dddc22ec7241cdf32cd28788ff04fb296648203.tar.xz
forums-6dddc22ec7241cdf32cd28788ff04fb296648203.zip
[ticket/11448] Use of $user_id parameter to mark a user's notifications read
Currently, the $user_id is a parameter but is not used. This patch fixes that. PHPBB3-11448
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/notification/manager.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index ff83d4bb37..4e26234390 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -256,6 +256,7 @@ class phpbb_notification_manager
SET notification_read = 1
WHERE notification_time <= " . (int) $time .
(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
+ (($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '') .
(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
$this->db->sql_query($sql);
}