From 4d7641e16a50e1c4184710f79a08e70af426f0e5 Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Fri, 31 May 2019 10:40:22 +1200
Subject: [PATCH] FIX allowed pagetypes displaying incorrectly when switching
 subsite

This patch depends on an update to the CMS module that provides this
extension point. The code is inert when matched with existing CMS
versions.
---
 _config/extensions.yml                    |  1 +
 src/Extensions/HintsCacheKeyExtension.php | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/Extensions/HintsCacheKeyExtension.php

diff --git a/_config/extensions.yml b/_config/extensions.yml
index 1c90a55..32731f5 100644
--- a/_config/extensions.yml
+++ b/_config/extensions.yml
@@ -50,6 +50,7 @@ SilverStripe\Admin\SecurityAdmin:
 
 SilverStripe\CMS\Controllers\CMSMain:
   extensions:
+    - SilverStripe\Subsites\Extensions\HintsCacheKeyExtension
     - SilverStripe\Subsites\Extensions\SubsiteMenuExtension
 
 SilverStripe\CMS\Controllers\CMSPagesController:
diff --git a/src/Extensions/HintsCacheKeyExtension.php b/src/Extensions/HintsCacheKeyExtension.php
new file mode 100644
index 0000000..74fb594
--- /dev/null
+++ b/src/Extensions/HintsCacheKeyExtension.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace SilverStripe\Subsites\Extensions;
+
+use SilverStripe\CMS\Controllers\CMSMain;
+use SilverStripe\Core\Extension;
+use SilverStripe\Subsites\State\SubsiteState;
+
+/**
+ * This extension adds the current Subsite ID as an additional factor to the Hints Cßache Key, which is used to cache
+ * the Site Tree Hints (which include allowed pagetypes).
+ *
+ * @package SilverStripe\Subsites\Extensions
+ * @see CMSMain::generateHintsCacheKey()
+ */
+class HintsCacheKeyExtension extends Extension
+{
+    public function updateHintsCacheKey(&$baseKey)
+    {
+        $baseKey .= '_Subsite:' . SubsiteState::singleton()->getSubsiteId();
+    }
+}