From 362c2f3b6488a1905ea5817f36dffd9f0567acb1 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Mon, 13 Aug 2018 13:50:50 +0100
Subject: [PATCH] Make sure that CMS requests disable caching

---
 admin/code/LeftAndMain.php | 2 ++
 security/Security.php      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
index 13e16852e..fc2e940cd 100644
--- a/admin/code/LeftAndMain.php
+++ b/admin/code/LeftAndMain.php
@@ -221,6 +221,8 @@ class LeftAndMain extends Controller implements PermissionProvider {
 	public function init() {
 		parent::init();
 
+		HTTPCacheControl::singleton()->disableCache();
+
 		Config::inst()->update('SSViewer', 'rewrite_hash_links', false);
 		Config::inst()->update('ContentNegotiator', 'enabled', false);
 
diff --git a/security/Security.php b/security/Security.php
index 15a905800..225092569 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -413,6 +413,7 @@ class Security extends Controller implements TemplateGlobalProvider {
 	 * sessions don't timeout. A common use is in the admin.
 	 */
 	public function ping() {
+		HTTPCacheControl::singleton()->disableCache();
 		Requirements::clear();
 		return 1;
 	}