diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-27 10:28:57 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-27 10:31:42 -0600 |
| commit | 5a8520da62a540f140319ecaef011fc49eaba451 (patch) | |
| tree | 24b7620f0af2e2150be9d6bf1c3c4f5e04ca81be | |
| parent | 860db97a09690f8f2ec760ab8bca103dca3f1fc9 (diff) | |
| download | forums-5a8520da62a540f140319ecaef011fc49eaba451.tar forums-5a8520da62a540f140319ecaef011fc49eaba451.tar.gz forums-5a8520da62a540f140319ecaef011fc49eaba451.tar.bz2 forums-5a8520da62a540f140319ecaef011fc49eaba451.tar.xz forums-5a8520da62a540f140319ecaef011fc49eaba451.zip | |
[ticket/11103] Fix some more merging issues
PHPBB3-11103
| -rw-r--r-- | phpBB/includes/notification/manager.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php index 9858cda898..52cfa77388 100644 --- a/phpBB/includes/notification/manager.php +++ b/phpBB/includes/notification/manager.php @@ -240,7 +240,7 @@ class phpbb_notification_manager SET notification_read = 1 WHERE notification_time <= " . $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) . "'") : '') . - (($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_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); } @@ -269,8 +269,6 @@ class phpbb_notification_manager $sql = 'UPDATE ' . $this->notifications_table . " SET notification_read = 1 WHERE item_type = '" . $this->db->sql_escape($item_type) . "' - SET notification_read = 1 - WHERE notification_type = '" . $this->db->sql_escape($notification_type) . "' AND notification_time <= " . $time . (($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') . (($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : ''); |