From 036420470da5def5c8e45c94601d3494273d476c Mon Sep 17 00:00:00 2001
From: Loz Calver <lozcalver@bigfork.co.uk>
Date: Tue, 8 Mar 2016 15:00:29 +0000
Subject: [PATCH 1/3] FIX: Incorrect title attribute on CMS tabs

---
 templates/Includes/CMSMain_Content.ss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/Includes/CMSMain_Content.ss b/templates/Includes/CMSMain_Content.ss
index 27104f0f..5f4afae6 100644
--- a/templates/Includes/CMSMain_Content.ss
+++ b/templates/Includes/CMSMain_Content.ss
@@ -8,18 +8,18 @@
 		<div class="cms-content-header-tabs">
 			<ul class="cms-tabset-nav-primary">
 				<li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-active<% end_if %>">
-					<a href="$LinkPageEdit" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit">
-						<% _t('CMSMain.TabContent', 'Content') %>
+					<a href="$LinkPageEdit" class="cms-panel-link" title="<%t CMSMain.TabContent 'Content' %>" data-href="$LinkPageEdit">
+						<%t CMSMain.TabContent 'Content' %>
 					</a>
 				</li>
 				<li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-tabs-active<% end_if %>">
-					<a href="$LinkPageSettings" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings">
-						<% _t('CMSMain.TabSettings', 'Settings') %>
+					<a href="$LinkPageSettings" class="cms-panel-link" title="<%t CMSMain.TabSettings 'Settings' %>" data-href="$LinkPageSettings">
+						<%t CMSMain.TabSettings 'Settings' %>
 					</a>
 				</li>
 				<li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-tabs-active<% end_if %>">
-					<a href="$LinkPageHistory" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory">
-						<% _t('CMSMain.TabHistory', 'History') %>
+					<a href="$LinkPageHistory" class="cms-panel-link" title="<%t CMSMain.TabHistory 'History' %>" data-href="$LinkPageHistory">
+						<%t CMSMain.TabHistory 'History' %>
 					</a>
 				</li>
 			</ul>

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 2/3] 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>";

From d247a99769c520cc8ca0a98d815ee82aaef99a23 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 14 Mar 2016 10:32:12 +1300
Subject: [PATCH 3/3] Revert "FIX: Incorrect title attribute on CMS tabs"

---
 templates/Includes/CMSMain_Content.ss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/Includes/CMSMain_Content.ss b/templates/Includes/CMSMain_Content.ss
index 5f4afae6..27104f0f 100644
--- a/templates/Includes/CMSMain_Content.ss
+++ b/templates/Includes/CMSMain_Content.ss
@@ -8,18 +8,18 @@
 		<div class="cms-content-header-tabs">
 			<ul class="cms-tabset-nav-primary">
 				<li class="content-treeview<% if class == 'CMSPageEditController' %> ui-tabs-active<% end_if %>">
-					<a href="$LinkPageEdit" class="cms-panel-link" title="<%t CMSMain.TabContent 'Content' %>" data-href="$LinkPageEdit">
-						<%t CMSMain.TabContent 'Content' %>
+					<a href="$LinkPageEdit" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageEdit">
+						<% _t('CMSMain.TabContent', 'Content') %>
 					</a>
 				</li>
 				<li class="content-listview<% if class == 'CMSPageSettingsController' %> ui-tabs-active<% end_if %>">
-					<a href="$LinkPageSettings" class="cms-panel-link" title="<%t CMSMain.TabSettings 'Settings' %>" data-href="$LinkPageSettings">
-						<%t CMSMain.TabSettings 'Settings' %>
+					<a href="$LinkPageSettings" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageSettings">
+						<% _t('CMSMain.TabSettings', 'Settings') %>
 					</a>
 				</li>
 				<li class="content-listview<% if class == 'CMSPageHistoryController' %> ui-tabs-active<% end_if %>">
-					<a href="$LinkPageHistory" class="cms-panel-link" title="<%t CMSMain.TabHistory 'History' %>" data-href="$LinkPageHistory">
-						<%t CMSMain.TabHistory 'History' %>
+					<a href="$LinkPageHistory" class="cms-panel-link" title="Form_EditForm" data-href="$LinkPageHistory">
+						<% _t('CMSMain.TabHistory', 'History') %>
 					</a>
 				</li>
 			</ul>