API Update code to reflect changes to LeftAndMain

silverstripe · Oct 17, 2024 · 00caf8d · 00caf8d
1 parent 3939401
commit 00caf8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Extensions/LeftAndMainSubsites.php b/src/Extensions/LeftAndMainSubsites.php
@@ -280,7 +280,7 @@ protected function onBeforeInit()
                 // sessionNamespace() is protected - see for info
                 $override = $this->owner->config()->get('session_namespace');
                 $sessionNamespace = $override ? $override : get_class($this->owner);
-                $session->clear($sessionNamespace . '.currentPage');
+                $session->clear($sessionNamespace . '.currentRecord');
             }
 
             // Context: Subsite ID has already been set to the state via InitStateMiddleware
@@ -293,7 +293,7 @@ protected function onBeforeInit()
             $currentController = Controller::curr();
             if ($currentController instanceof CMSPageEditController) {
                 /** @var SiteTree $page */
-                $page = $currentController->currentPage();
+                $page = $currentController->currentRecord();
 
                 // If the page exists but doesn't belong to the requested subsite, redirect to admin/pages which
                 // will show a list of the requested subsite's pages
@@ -314,7 +314,7 @@ protected function onBeforeInit()
 
         // Automatically redirect the session to appropriate subsite when requesting a record.
         // This is needed to properly initialise the session in situations where someone opens the CMS via a link.
-        $record = $this->owner->currentPage();
+        $record = $this->owner->currentRecord();
         if ($record
             && isset($record->SubsiteID, $this->owner->urlParams['ID'])
             && is_numeric($record->SubsiteID)
@@ -379,7 +379,7 @@ protected function onBeforeInit()
         return;
     }
 
-    protected function augmentNewSiteTreeItem(&$item)
+    protected function updateNewItem(&$item)
     {
         $request = Controller::curr()->getRequest();
         $item->SubsiteID = $request->postVar('SubsiteID') ?: SubsiteState::singleton()->getSubsiteId();

diff --git a/tests/php/SiteTreeSubsitesTest.php b/tests/php/SiteTreeSubsitesTest.php
@@ -287,7 +287,7 @@ public function testPageTypesBlacklistInCMSMain()
 
         Subsite::changeSubsite($s1);
         $cmsmain = CMSMain::create();
-        $hints = json_decode($cmsmain->SiteTreeHints() ?? '', true);
+        $hints = json_decode($cmsmain->TreeHints() ?? '', true);
         $classes = $hints['Root']['disallowedChildren'];
         $this->assertContains(ErrorPage::class, $classes);
         $this->assertContains(TestClassA::class, $classes);
@@ -298,7 +298,7 @@ public function testPageTypesBlacklistInCMSMain()
         if ($cmsmain->hasMethod('getHintsCache')) {
             $cmsmain->getHintsCache()->clear();
         }
-        $hints = json_decode($cmsmain->SiteTreeHints() ?? '', true);
+        $hints = json_decode($cmsmain->TreeHints() ?? '', true);
 
         $classes = $hints['Root']['disallowedChildren'];
         $this->assertNotContains(ErrorPage::class, $classes);