diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-01-08 18:35:22 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-08 18:35:22 +0100 |
| commit | aaee7c7db94f025795bd442c860f79e7992c7bbe (patch) | |
| tree | 0f3f3a64990198c53a9d3861655708324dc3d133 | |
| parent | 4d5140abaf2e580ef62925dd60e732253f43af74 (diff) | |
| parent | 06b402bdecee8145639d50d17e1350971a5ec017 (diff) | |
| download | forums-aaee7c7db94f025795bd442c860f79e7992c7bbe.tar forums-aaee7c7db94f025795bd442c860f79e7992c7bbe.tar.gz forums-aaee7c7db94f025795bd442c860f79e7992c7bbe.tar.bz2 forums-aaee7c7db94f025795bd442c860f79e7992c7bbe.tar.xz forums-aaee7c7db94f025795bd442c860f79e7992c7bbe.zip | |
Merge pull request #4623 from rxu/ticket/14971
[ticket/14971] Fix pagination PHP warning on PHP 7.1
* rxu/ticket/14971:
[ticket/14971] Add on_page test with the string arguments
[ticket/14971] Fix pagination PHP warning on PHP 7.1
| -rw-r--r-- | phpBB/phpbb/pagination.php | 2 | ||||
| -rw-r--r-- | tests/pagination/pagination_test.php | 6 |
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', + ), ); } |