Skip to content
Permalink
Browse files

FIX Use `Controller::join_links()` in Reports

  • Loading branch information...
dhensby committed Mar 10, 2016
1 parent 11aadbe commit bc31d9ca9c667ba9015e35d5eae20158056a7b7c
Showing with 3 additions and 3 deletions.
  1. +1 −1 code/reports/BrokenLinksReport.php
  2. +2 −2 code/reports/SideReport.php
@@ -104,7 +104,7 @@ public function columns() {
$stageLink = $item->AbsoluteLink();
return sprintf('%s <a href="%s">%s</a>',
$stageLink,
$liveLink ? $liveLink : $stageLink . '?stage=Stage',
$liveLink ? $liveLink : Controller::join_links($stageLink, '?stage=Stage'),
$liveLink ? '(live)' : '(draft)'
);
}
@@ -92,8 +92,8 @@ protected function formatValue($record, $source, $info) {
}
if(isset($info['link']) && $info['link']) {
$linkBase = singleton('CMSPageEditController')->Link('show') . '/';
$link = ($info['link'] === true) ? $linkBase . $record->ID : $info['link'];
$linkBase = singleton('CMSPageEditController')->Link('show');
$link = ($info['link'] === true) ? Controller::join_links($linkBase, $record->ID) : $info['link'];
return $prefix . "<a $classClause href=\"$link\">$val</a>";
} else {
return $prefix . "<span $classClause>$val</span>";

0 comments on commit bc31d9c

Please sign in to comment.
You can’t perform that action at this time.