Merge branch '5.1' into 5

This commit is contained in:
github-actions 2023-12-09 13:24:12 +00:00
commit d3959630c8

View File

@ -530,7 +530,11 @@ class SiteTreeTest extends SapphireTest
$staff->RelativeLink(), $staff->RelativeLink(),
'Matches URLSegment plus parent on second level without parameters' 'Matches URLSegment plus parent on second level without parameters'
); );
$this->assertEquals('0/', $numeric0->RelativeLink(), 'Matches URLSegment for segment = 0'); $this->assertEquals(
Controller::normaliseTrailingSlash('0/'),
$numeric0->RelativeLink(),
'Matches URLSegment for segment = 0'
);
$this->assertEquals( $this->assertEquals(
'about-us/edit', 'about-us/edit',
$about->RelativeLink('edit'), $about->RelativeLink('edit'),