NOW MANAGED ON CODEBERG
Search: Fixed pagination not considering sub-paths
Dan Brown0b4836178050
diff --git a/app/Search/SearchController.php b/app/Search/SearchController.phpindex 2b9ea7974..8a6a5bbde 100644--- a/app/Search/SearchController.php+++ b/app/Search/SearchController.php@@ -30,7 +30,7 @@ class SearchController extends Controller$results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, $count);$formatter->format($results['results']->all(), $searchOpts);$paginator = new LengthAwarePaginator($results['results'], $results['total'], $count, $page);- $paginator->setPath('/search');+ $paginator->setPath(url('/search'));$paginator->appends($request->except('page'));$this->setPageTitle(trans('entities.search_for_term', ['term' => $fullSearchString]));diff --git a/tests/Search/EntitySearchTest.php b/tests/Search/EntitySearchTest.phpindex 8501b65c4..cb1149dd1 100644--- a/tests/Search/EntitySearchTest.php+++ b/tests/Search/EntitySearchTest.php@@ -30,7 +30,15 @@ class EntitySearchTest extends TestCasepublic function test_search_shows_pagination(){$search = $this->asEditor()->get('/search?term=a');- $this->withHtml($search)->assertLinkExists('/search?term=a&page=2', '2');+ $this->withHtml($search)->assertLinkExists(url('/search?term=a&page=2'), '2');+ }++ public function test_pagination_considers_sub_path_url_handling()+ {+ $this->runWithEnv(['APP_URL' => 'https://example.com/subpath'], function () {+ $search = $this->asEditor()->get('https://example.com/search?term=a');+ $this->withHtml($search)->assertLinkExists('https://example.com/subpath/search?term=a&page=2', '2');+ });}public function test_invalid_page_search()