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 3.1 into 3.2

Browse Source 
Conflicts:
	code/reports/SideReport.php
This commit is contained in:
Daniel Hensby 2016-04-26 00:09:19 +01:00
commit 6cd1837f0c
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/reports/BrokenLinksReport.php
View File

@ -112,7 +112,7 @@ class BrokenLinksReport extends SS_Report {
$stageLink = $item->AbsoluteLink(); $stageLink = $item->AbsoluteLink();
return sprintf('%s <a href="%s">%s</a>', return sprintf('%s <a href="%s">%s</a>',
$stageLink, $stageLink,
$liveLink ? $liveLink : $stageLink . '?stage=Stage', $liveLink ? $liveLink : Controller::join_links($stageLink, '?stage=Stage'),
$liveLink ? '(live)' : '(draft)' $liveLink ? '(live)' : '(draft)'
); );
} }