Skip to content
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

SS5: move updateRelativeLink hook after concatination #2770

Merged
merged 5 commits into from
Aug 31, 2022
Merged

SS5: move updateRelativeLink hook after concatination #2770

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d53463
move updateRelativeLink hook after concatination to make it actually …
xini Aug 26, 2022
2261d73
keep existing parameters the same
xini Aug 28, 2022
a0dab67
revert to link parameter be first
xini Aug 28, 2022
a96cca3
update updateRelativeLink method signature in SiteTreeExtension
xini Aug 29, 2022
e7003c7
don't pass old parameters by reference
xini Aug 29, 2022
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
8 changes: 5 additions & 3 deletions code/Model/SiteTree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,15 +688,17 @@ public function RelativeLink($action = null)
$base = $this->URLSegment;
}

$this->extend('updateRelativeLink', $base, $action);

// Legacy support: If $action === true, retain URLSegment for homepages,
// but don't append any action
if ($action === true) {
$action = null;
}

return Controller::join_links($base, '/', $action);
$link = Controller::join_links($base, '/', $action);

$this->extend('updateRelativeLink', $link, $base, $action);
xini marked this conversation as resolved.
Show resolved Hide resolved

return $link;
}

/**
Expand Down