diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2022-11-22 22:47:24 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2022-11-22 23:23:40 +0000 |
| commit | 64aa0add0934f0044b2411ec037c996b0e733a74 (patch) | |
| tree | d8bdfb4d7095cd7f86aa35bbdbfa4eeeea00ab8a /app | |
| parent | 7fa18cfdad1985939b9339a38adfaf62175c47de (diff) | |
| download | webtrees-64aa0add0934f0044b2411ec037c996b0e733a74.tar.gz webtrees-64aa0add0934f0044b2411ec037c996b0e733a74.tar.bz2 webtrees-64aa0add0934f0044b2411ec037c996b0e733a74.zip | |
Fix: #4609 - Allow empty (as opposed to missing) slugs in URLs
Diffstat (limited to 'app')
| -rw-r--r-- | app/Http/Routes/WebRoutes.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/app/Http/Routes/WebRoutes.php b/app/Http/Routes/WebRoutes.php index db229588d1..7d67a3f8e9 100644 --- a/app/Http/Routes/WebRoutes.php +++ b/app/Http/Routes/WebRoutes.php @@ -668,17 +668,17 @@ class WebRoutes $router->get(CalendarEvents::class, '/calendar-events/{view}'); $router->get(ContactPage::class, '/contact'); $router->post(ContactAction::class, '/contact'); - $router->get(FamilyPage::class, '/family/{xref}{/slug}'); - $router->get(HeaderPage::class, '/header/{xref}{/slug}'); - $router->get(IndividualPage::class, '/individual/{xref}{/slug}'); - $router->get(LocationPage::class, '/location/{xref}{/slug}'); + $router->get(FamilyPage::class, '/family/{xref}{/slug}')->tokens(['slug' => '.*']); + $router->get(HeaderPage::class, '/header/{xref}{/slug}')->tokens(['slug' => '.*']); + $router->get(IndividualPage::class, '/individual/{xref}{/slug}')->tokens(['slug' => '.*']); + $router->get(LocationPage::class, '/location/{xref}{/slug}')->tokens(['slug' => '.*']); $router->get(MediaFileThumbnail::class, '/media-thumbnail'); $router->get(MediaFileDownload::class, '/media-download'); - $router->get(MediaPage::class, '/media/{xref}{/slug}'); - $router->get(NotePage::class, '/note/{xref}{/slug}'); - $router->get(SharedNotePage::class, '/shared-note/{xref}{/slug}'); - $router->get(GedcomRecordPage::class, '/record/{xref}{/slug}'); - $router->get(RepositoryPage::class, '/repository/{xref}{/slug}'); + $router->get(MediaPage::class, '/media/{xref}{/slug}')->tokens(['slug' => '.*']); + $router->get(NotePage::class, '/note/{xref}{/slug}')->tokens(['slug' => '.*']); + $router->get(SharedNotePage::class, '/shared-note/{xref}{/slug}')->tokens(['slug' => '.*']); + $router->get(GedcomRecordPage::class, '/record/{xref}{/slug}')->tokens(['slug' => '.*']); + $router->get(RepositoryPage::class, '/repository/{xref}{/slug}')->tokens(['slug' => '.*']); $router->get(ReportListPage::class, '/report'); $router->post(ReportListAction::class, '/report'); $router->get(ReportSetupPage::class, '/report/{report}'); @@ -691,9 +691,9 @@ class WebRoutes $router->get(SearchPhoneticPage::class, '/search-phonetic'); $router->post(SearchPhoneticAction::class, '/search-phonetic'); $router->post(SearchQuickAction::class, '/search-quick'); - $router->get(SourcePage::class, '/source/{xref}{/slug}'); - $router->get(SubmissionPage::class, '/submission/{xref}{/slug}'); - $router->get(SubmitterPage::class, '/submitter/{xref}{/slug}'); + $router->get(SourcePage::class, '/source/{xref}{/slug}')->tokens(['slug' => '.*']); + $router->get(SubmissionPage::class, '/submission/{xref}{/slug}')->tokens(['slug' => '.*']); + $router->get(SubmitterPage::class, '/submitter/{xref}{/slug}')->tokens(['slug' => '.*']); $router->get(TomSelectFamily::class, '/tom-select-family'); $router->get(TomSelectIndividual::class, '/tom-select-individual'); $router->get(TomSelectLocation::class, '/tom-select-location'); |