From bc31d9ca9c667ba9015e35d5eae20158056a7b7c Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Thu, 10 Mar 2016 16:38:42 +0000
Subject: [PATCH] FIX Use `Controller::join_links()` in Reports

---
 code/reports/BrokenLinksReport.php | 2 +-
 code/reports/SideReport.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 5cdf46cb..bf313048 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -104,7 +104,7 @@ class BrokenLinksReport extends SS_Report {
 					$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)'
 					);
 				}
diff --git a/code/reports/SideReport.php b/code/reports/SideReport.php
index c1b2fde0..0a7dec88 100644
--- a/code/reports/SideReport.php
+++ b/code/reports/SideReport.php
@@ -92,8 +92,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>";