aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-21 21:05:35 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-21 21:05:35 +0100
commitb104bf5791e18bbd321db95d751abb1c7682fe9a (patch)
tree47677d8d35f33851b89e20a4e01f28451beaeb0f
parent1104f788c313caaa4a8754dc674de01647b89ca3 (diff)
parentf719803fdc8f16430ed3e85625dd337da1de52d9 (diff)
downloadforums-b104bf5791e18bbd321db95d751abb1c7682fe9a.tar
forums-b104bf5791e18bbd321db95d751abb1c7682fe9a.tar.gz
forums-b104bf5791e18bbd321db95d751abb1c7682fe9a.tar.bz2
forums-b104bf5791e18bbd321db95d751abb1c7682fe9a.tar.xz
forums-b104bf5791e18bbd321db95d751abb1c7682fe9a.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/phpbb/notification/manager.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index 971a53a16a..dd611e1dd1 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -292,7 +292,7 @@ class manager
WHERE notification_time <= " . (int) $time .
(($notification_type_name !== false) ? ' AND ' .
(is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name)) : '') .
- (($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) : '') .
+ (($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id, false, true) : '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) : '');
$this->db->sql_query($sql);
}