Skip to content

[6.x] Handle trailing slashes in CP Nav #13846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duncanmcclean wants to merge 1 commit into
base: 6.x
Choose a base branch
from
+3 −3
Open

[6.x] Handle trailing slashes in CP Nav #13846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/CP/Navigation/NavItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ public function isActive()
}
}

return request()->url() === URL::removeQueryAndFragment($this->url);
return URL::tidy(request()->url()) === URL::removeQueryAndFragment($this->url);
}

/**
Expand Down Expand Up @@ -438,7 +438,7 @@ protected function hasActiveChild()
if ($childrenUrls = NavBuilder::getUnresolvedChildrenUrlsForItem($this)) {
return collect($childrenUrls)
->map(fn ($url) => URL::removeQueryAndFragment($url))
->contains(request()->url());
->contains(URL::tidy(request()->url()));
}

return false;
Expand All @@ -451,7 +451,7 @@ protected function hasActiveChild()
*/
protected function currentUrlIsNotExplicitlyReferencedInNav()
{
return ! NavBuilder::getAllUrls()->contains(request()->url());
return ! NavBuilder::getAllUrls()->contains(URL::tidy(request()->url()));
}

/**
Expand Down