diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-03-26 15:19:28 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-03-26 15:19:28 -0700 |
| commit | c9aa39be5de14ff50c27cd5246b85844855da844 (patch) | |
| tree | acacb971bdf0d06bd56a2724c20d28b5935da70b | |
| parent | 59e0196846b4e37c338d1a783354d1d2934c535b (diff) | |
| parent | 6dddc22ec7241cdf32cd28788ff04fb296648203 (diff) | |
| download | forums-c9aa39be5de14ff50c27cd5246b85844855da844.tar forums-c9aa39be5de14ff50c27cd5246b85844855da844.tar.gz forums-c9aa39be5de14ff50c27cd5246b85844855da844.tar.bz2 forums-c9aa39be5de14ff50c27cd5246b85844855da844.tar.xz forums-c9aa39be5de14ff50c27cd5246b85844855da844.zip | |
Merge pull request #1318 from imkingdavid/ticket/11448
[ticket/11448] Use of $user_id parameter to mark a user's notifications read
| -rw-r--r-- | phpBB/includes/notification/manager.php | 1 |
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); } |