From 4fe07e6fe257a5f63a23f66875d923d3b911f00d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 18 Sep 2022 21:44:37 -0600 Subject: [PATCH] Update ApiV1Controller, fix pagination header. Fixes #3354 --- app/Http/Controllers/Api/ApiV1Controller.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index e4da6a0ed..86db277db 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -1897,15 +1897,15 @@ class ApiV1Controller extends Controller } if($maxId) { - $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"'; + $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"'; } if($minId) { - $link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; + $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"'; } if($maxId && $minId) { - $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; + $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"'; } $headers = isset($link) ? ['Link' => $link] : []; @@ -2019,15 +2019,15 @@ class ApiV1Controller extends Controller } if($maxId) { - $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"'; + $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"'; } if($minId) { - $link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; + $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"'; } if($maxId && $minId) { - $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; + $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"'; } $headers = isset($link) ? ['Link' => $link] : []; @@ -2136,15 +2136,15 @@ class ApiV1Controller extends Controller } if($maxId) { - $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"'; + $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"'; } if($minId) { - $link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; + $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"'; } if($maxId && $minId) { - $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; + $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"'; } $headers = isset($link) ? ['Link' => $link] : [];