2 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php
index 7a81c25ad2..a5a95b096d 100644
--- a/phpBB/phpbb/pagination.php
+++ b/phpBB/phpbb/pagination.php
@@ -284,7 +284,7 @@ class pagination
 	*/
 	public function get_on_page($per_page, $start)
 	{
-		return floor($start / $per_page) + 1;
+		return floor((int) $start / (int) $per_page) + 1;
 	}
 
 	/**
diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php
index 30b25913f7..2d7d1671a8 100644
--- a/tests/pagination/pagination_test.php
+++ b/tests/pagination/pagination_test.php
@@ -219,6 +219,12 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 				0,
 				'PAGE_OF-1-1',
 			),
+			array(
+				'10',
+				'10',
+				'0',
+				'PAGE_OF-1-1',
+			),
 		);
 	}