Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

[5.2] SEF/Router: Only merge default menu item when same component #43164

Merged
merged 16 commits into from
Jul 24, 2024
Merged

[5.2] SEF/Router: Only merge default menu item when same component #43164

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
773a13f
Router: Only merge default menu item when same component
Hackwar Mar 26, 2024
d61c309
Merge branch '5.2-dev' into 5.2-router-default
Hackwar Mar 27, 2024
8accc62
Update libraries/src/Router/SiteRouter.php
Hackwar Mar 27, 2024
0075e83
Merge branch '5.2-dev' into 5.2-router-default
Quy Apr 8, 2024
25aef12
Merge branch '5.2-dev' into 5.2-router-default
Hackwar Apr 9, 2024
859a01a
Merge branch '5.2-dev' into 5.2-router-default
Hackwar Apr 29, 2024
0198f56
Fixing cypress test
Hackwar May 3, 2024
44ecb8c
Merge branch '5.2-dev' of https://github.com/joomla/joomla-cms into 5…
Hackwar May 3, 2024
e2d6a1d
Merge branch '5.2-router-default' of github.com:Hackwar/joomla-cms in…
Hackwar May 3, 2024
05ea308
Merge branch '5.2-dev' into 5.2-router-default
Hackwar May 6, 2024
3f62f02
Another fix to unit tests
Hackwar May 11, 2024
ae15ae7
Don't merge the parameters, but set the active menu item
Hackwar Jul 19, 2024
311a2b1
Reverting change to tests.
Hackwar Jul 19, 2024
359bbde
Merge branch 'refs/heads/5.2-dev' into 5.2-router-default
Hackwar Jul 19, 2024
bfa035f
Merge branch '5.2-dev' into 5.2-router-default
Quy Jul 19, 2024
fdccffd
Merge branch '5.2-dev' into 5.2-router-default
Hackwar Jul 24, 2024
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: 6 additions & 0 deletions libraries/src/Router/SiteRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,12 @@ public function parseRawRoute(&$router, &$uri)
$item = $this->menu->getItem($uri->getVar('Itemid'));
} else {
$item = $this->menu->getDefault($this->app->getLanguage()->getTag());

if ($item->query['option'] !== $uri->getVar('option', $item->query['option'])) {
// Set the active menu item
$this->menu->setActive($item->id);
$item = false;
}
}

if ($item && $item->type === 'alias') {
Expand Down