mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-06-29 07:59:37 +02:00
Merge branch '3.3' into 3.4
This commit is contained in:
commit
c7b1a4ded8
|
@ -549,7 +549,9 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
|
||||||
));
|
));
|
||||||
if($live) {
|
if($live) {
|
||||||
$link = $live->AbsoluteLink();
|
$link = $live->AbsoluteLink();
|
||||||
if($includeStageEqualsLive) $link .= '?stage=Live';
|
if($includeStageEqualsLive) {
|
||||||
|
$link = Controller::join_links($link, '?stage=Live');
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$link = null;
|
$link = null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user