8 files changed, 9 insertions, 14 deletions
diff --git a/phpBB/phpbb/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php
index 5e6fdd2523..003998677d 100644
--- a/phpBB/phpbb/notification/type/bookmark.php
+++ b/phpBB/phpbb/notification/type/bookmark.php
@@ -75,7 +75,7 @@ class bookmark extends \phpbb\notification\type\post
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$users[] = $row['user_id'];
+			$users[] = (int) $row['user_id'];
 		}
 		$this->db->sql_freeresult($result);
 
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index bc42c4422b..b2ad8ff33d 100644
--- a/phpBB/phpbb/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
@@ -103,7 +103,7 @@ class post extends \phpbb\notification\type\base
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$users[] = $row['user_id'];
+			$users[] = (int) $row['user_id'];
 		}
 		$this->db->sql_freeresult($result);
 
@@ -115,7 +115,7 @@ class post extends \phpbb\notification\type\base
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$users[] = $row['user_id'];
+			$users[] = (int) $row['user_id'];
 		}
 		$this->db->sql_freeresult($result);
 
diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php
index e8527261d8..745430e114 100644
--- a/phpBB/phpbb/notification/type/quote.php
+++ b/phpBB/phpbb/notification/type/quote.php
@@ -94,7 +94,7 @@ class quote extends \phpbb\notification\type\post
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$users[] = $row['user_id'];
+			$users[] = (int) $row['user_id'];
 		}
 		$this->db->sql_freeresult($result);
 
diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php
index 98f086a50b..635d05bccd 100644
--- a/phpBB/phpbb/notification/type/topic.php
+++ b/phpBB/phpbb/notification/type/topic.php
@@ -103,7 +103,7 @@ class topic extends \phpbb\notification\type\base
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$users[] = $row['user_id'];
+			$users[] = (int) $row['user_id'];
 		}
 		$this->db->sql_freeresult($result);
 
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index fb8e2ac807..10d676c687 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -133,7 +133,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
 			FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt
 			WHERE nt.notification_type_name = '" . $this->item_type . "'
 				AND n.notification_type_id = nt.notification_type_id
-			ORDER BY user_id, item_id ASC";
+			ORDER BY user_id ASC, item_id ASC";
 		$result = $this->db->sql_query($sql);
 		$this->assertEquals($expected_before, $this->db->sql_fetchrowset($result));
 		$this->db->sql_freeresult($result);
@@ -142,11 +142,6 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
 		$post_data = array_merge($this->post_data, $additional_post_data);
 		submit_post('reply', '', 'poster-name', POST_NORMAL, $poll_data, $post_data, false, false);
 
-		$sql = 'SELECT user_id, item_id, item_parent_id
-			FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt
-			WHERE nt.notification_type_name = '" . $this->item_type . "'
-				AND n.notification_type_id = nt.notification_type_id
-			ORDER BY user_id ASC, item_id ASC";
 		$result = $this->db->sql_query($sql);
 		$this->assertEquals($expected_after, $this->db->sql_fetchrowset($result));
 		$this->db->sql_freeresult($result);
diff --git a/tests/notification/submit_post_type_bookmark_test.php b/tests/notification/submit_post_type_bookmark_test.php
index 861017ff5f..4e4a3f6c9a 100644
--- a/tests/notification/submit_post_type_bookmark_test.php
+++ b/tests/notification/submit_post_type_bookmark_test.php
@@ -27,7 +27,7 @@ class phpbb_notification_submit_post_type_bookmark_test extends phpbb_notificati
 				$this->greaterThan(0))
 			->will($this->returnValueMap(array(
 				array(
-					array('3', '4', '5', '6', '7'),
+					array(3, 4, 5, 6, 7),
 					'f_read',
 					1,
 					array(
diff --git a/tests/notification/submit_post_type_post_test.php b/tests/notification/submit_post_type_post_test.php
index 473247a764..c2eb419522 100644
--- a/tests/notification/submit_post_type_post_test.php
+++ b/tests/notification/submit_post_type_post_test.php
@@ -27,7 +27,7 @@ class phpbb_notification_submit_post_type_post_test extends phpbb_notification_s
 				$this->greaterThan(0))
 			->will($this->returnValueMap(array(
 				array(
-					array('3', '4', '5', '6', '7', '8'),
+					array(3, 4, 5, 6, 7, 8),
 					'f_read',
 					1,
 					array(
diff --git a/tests/notification/submit_post_type_quote_test.php b/tests/notification/submit_post_type_quote_test.php
index 2b66d9c6a1..a849cb7b1b 100644
--- a/tests/notification/submit_post_type_quote_test.php
+++ b/tests/notification/submit_post_type_quote_test.php
@@ -27,7 +27,7 @@ class phpbb_notification_submit_post_type_quote_test extends phpbb_notification_
 				$this->greaterThan(0))
 			->will($this->returnValueMap(array(
 				array(
-					array('3', '4', '5', '6', '7'),
+					array(3, 4, 5, 6, 7),
 					'f_read',
 					1,
 					array(