Merge pull request #11662 from nanaya/clamp-null

Fix parsing page parameter of ranking page
ppy · Nov 16, 2024 · 0a7736c · 0a7736c
2 parents 681f50a + 6cb743c
commit 0a7736c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/RankingController.php
@@ -212,8 +212,8 @@ public function index($mode, $type)
 
         $maxResults = $this->maxResults($modeInt, $stats);
         $maxPages = ceil($maxResults / static::PAGE_SIZE);
-        // TODO: less repeatedly getting params out of request.
-        $page = \Number::clamp(get_int(request('cursor.page') ?? request('page') ?? 1), 1, $maxPages);
+        $params = get_params(\Request::all(), null, ['cursor.page:int', 'page']);
+        $page = \Number::clamp($params['cursor']['page'] ?? $params['page'] ?? 1, 1, $maxPages);
 
         $stats = $stats->limit(static::PAGE_SIZE)
             ->offset(static::PAGE_SIZE * ($page - 1))