From d85cc24aa06ce279ab672d6e04dcd11b0b75d1d6 Mon Sep 17 00:00:00 2001
From: mattclegg <m@cle.gg>
Date: Fri, 10 Apr 2020 09:11:00 +0545
Subject: [PATCH 1/2] DOCS: Set @var to SiteTree where appropriate

---
 code/Controllers/CMSMain.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
index b39f5a0b..f2f93a16 100644
--- a/code/Controllers/CMSMain.php
+++ b/code/Controllers/CMSMain.php
@@ -1687,6 +1687,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
                 }
             },
             'getTreeTitle' => function ($value, &$item) {
+                /** @var SiteTree $item */
                 $title = sprintf(
                     '<a class="action-detail" href="%s">%s</a>',
                     Controller::join_links(
@@ -2073,7 +2074,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
         $id = (isset($data['ID'])) ? (int) $data['ID'] : null;
         $version = (isset($data['Version'])) ? (int) $data['Version'] : null;
 
-        /** @var DataObject|Versioned $record */
+        /** @var SiteTree|Versioned $record */
         $record = Versioned::get_latest_version($this->config()->get('tree_class'), $id);
         if ($record && !$record->canEdit()) {
             return Security::permissionFailure($this);
@@ -2269,6 +2270,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
                 throw new HTTPResponse_Exception("Bad record ID #$id", 404);
             }
 
+            /** @var SiteTree $newPage */
             $newPage = $page->duplicate();
 
             // ParentID can be hard-set in the URL.  This is useful for pages with multiple parents
@@ -2312,6 +2314,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
                 throw new HTTPResponse_Exception("Bad record ID #$id", 404);
             }
 
+            /** @var SiteTree $newPage */
             $newPage = $page->duplicateWithChildren();
 
             $this->getResponse()->addHeader(

From 58795a2324dfd8313bff01eb1b949b29de797378 Mon Sep 17 00:00:00 2001
From: mattclegg <m@cle.gg>
Date: Fri, 10 Apr 2020 09:12:39 +0545
Subject: [PATCH 2/2] REFACTOR: Remove duplication and set SiteTree instances
 to use generic CMSEditLink()

---
 code/Controllers/CMSMain.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
index f2f93a16..c95c939a 100644
--- a/code/Controllers/CMSMain.php
+++ b/code/Controllers/CMSMain.php
@@ -1690,10 +1690,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
                 /** @var SiteTree $item */
                 $title = sprintf(
                     '<a class="action-detail" href="%s">%s</a>',
-                    Controller::join_links(
-                        CMSPageEditController::singleton()->Link('show'),
-                        (int)$item->ID
-                    ),
+                    $item->CMSEditLink(),
                     $item->TreeTitle // returns HTML, does its own escaping
                 );
                 $breadcrumbs = $item->Breadcrumbs(20, true, false, true, '/');
@@ -2101,7 +2098,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
         // Can be used in different contexts: In normal page edit view, in which case the redirect won't have any effect.
         // Or in history view, in which case a revert causes the CMS to re-load the edit view.
         // The X-Pjax header forces a "full" content refresh on redirect.
-        $url = Controller::join_links(CMSPageEditController::singleton()->Link('show'), $record->ID);
+        $url = $record->CMSEditLink();
         $this->getResponse()->addHeader('X-ControllerURL', $url);
         $this->getRequest()->addHeader('X-Pjax', 'Content');
         $this->getResponse()->addHeader('X-Pjax', 'Content');
@@ -2287,7 +2284,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
                     array('title' => $newPage->Title)
                 ))
             );
-            $url = Controller::join_links(CMSPageEditController::singleton()->Link('show'), $newPage->ID);
+            $url = $newPage->CMSEditLink();
             $this->getResponse()->addHeader('X-ControllerURL', $url);
             $this->getRequest()->addHeader('X-Pjax', 'Content');
             $this->getResponse()->addHeader('X-Pjax', 'Content');
@@ -2325,7 +2322,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
                     array('title' => $newPage->Title)
                 ))
             );
-            $url = Controller::join_links(CMSPageEditController::singleton()->Link('show'), $newPage->ID);
+            $url = $newPage->CMSEditLink();
             $this->getResponse()->addHeader('X-ControllerURL', $url);
             $this->getRequest()->addHeader('X-Pjax', 'Content');
             $this->getResponse()->addHeader('X-Pjax', 'Content');