Merge pull request #28 from dhensby/pulls/3.2/join-links-fix

FIX Bad joining of links in reports
This commit is contained in:
Damian Mooyman 2016-03-21 14:34:50 +13:00
commit dfb7b4d29f

View File

@ -88,8 +88,8 @@ class SideReportView extends ViewableData {
}
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>";