tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Daniel Hensby 2016-07-14 12:24:04 +01:00
commit c7b1a4ded8
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/model/SiteTree.php
View File

@ -549,7 +549,9 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
));
if($live) {
$link = $live->AbsoluteLink();
if($includeStageEqualsLive) $link .= '?stage=Live';
if($includeStageEqualsLive) {
$link = Controller::join_links($link, '?stage=Live');
}
} else {
$link = null;
}