From 257115943e2a3350bf29ad3ab72fc50a6ae60e7d Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Mon, 6 Aug 2018 02:02:58 +0200 Subject: Allow paginating package comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg Signed-off-by: Lukas Fleischer --- web/lib/pkgbasefuncs.inc.php | 5 +++-- web/lib/pkgfuncs.inc.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 953a5817..b39bca5b 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -291,9 +291,10 @@ function pkgbase_display_details($base_id, $row, $SID="") { unset($pinned); - $limit = isset($_GET['comments']) ? 0 : 10; - $comments = pkgbase_comments($base_id, $limit, $include_deleted); + $total_comment_count = pkgbase_comments_count($base_id, $include_deleted); + list($pagination_templs, $per_page, $offset) = calculate_pagination($total_comment_count); + $comments = pkgbase_comments($base_id, $per_page, $include_deleted, false, $offset); if (!empty($comments)) { $comment_section = "package"; include('pkg_comments.php'); diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 140b8fc2..ced1f8e2 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -630,9 +630,10 @@ function pkg_display_details($id=0, $row, $SID="") { unset($pinned); - $limit = isset($_GET['comments']) ? 0 : 10; - $comments = pkgbase_comments($base_id, $limit, $include_deleted); + $total_comment_count = pkgbase_comments_count($base_id, $include_deleted); + list($pagination_templs, $per_page, $offset) = calculate_pagination($total_comment_count); + $comments = pkgbase_comments($base_id, $per_page, $include_deleted, false, $offset); if (!empty($comments)) { $comment_section = "package"; include('pkg_comments.php'); -- cgit v1.2.3-24-g4f1b