Merge branch '3' into 4.0

src/Extensions/LeftAndMainSubsites.php

@@ -300,7 +300,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
@@ -321,7 +321,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)

yarn.lock

@@ -2258,9 +2258,9 @@ cosmiconfig@^9.0.0:
     parse-json "^5.2.0"
 
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"