Merge 00caf8d4ad into 393940195d

_config/extensions.yml

@@ -51,6 +51,10 @@ SilverStripe\CMS\Controllers\CMSMain:
     - SilverStripe\Subsites\Extensions\HintsCacheKeyExtension
     - SilverStripe\Subsites\Extensions\SubsiteMenuExtension
 
+SilverStripe\CMS\Controllers\CMSPagesController:
+  extensions:
+    - SilverStripe\Subsites\Extensions\SubsiteMenuExtension
+
 SilverStripe\Subsites\Admin\SubsiteAdmin:
   extensions:
     - SilverStripe\Subsites\Extensions\SubsiteMenuExtension

src/Extensions/LeftAndMainSubsites.php

@@ -6,7 +6,7 @@ use SilverStripe\Admin\AdminRootController;
 use SilverStripe\Admin\CMSMenu;
 use SilverStripe\Admin\CMSProfileController;
 use SilverStripe\Admin\LeftAndMain;
-use SilverStripe\CMS\Controllers\CMSMain;
+use SilverStripe\CMS\Controllers\CMSPagesController;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\CMS\Controllers\CMSPageEditController;
 use SilverStripe\Control\Controller;
@@ -299,7 +299,7 @@ class LeftAndMainSubsites extends Extension
                 // will show a list of the requested subsite's pages
                 $currentSubsiteId = $request->getVar('SubsiteID');
                 if ($page && (int) $page->SubsiteID !== (int) $currentSubsiteId) {
-                    return $this->owner->redirect(CMSMain::singleton()->Link());
+                    return $this->owner->redirect(CMSPagesController::singleton()->Link());
                 }
 
                 // Page does belong to the current subsite, so remove the query string parameter and refresh the page