From 615c4cdb0442d3f966a270ed9eff65c19c6a7215 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Thu, 7 Nov 2019 12:14:32 -0600
Subject: [PATCH] Change default of cms.backendForceSecure to reflect the
 config default that's been in place since 2016.

---
 modules/system/traits/SecurityController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/system/traits/SecurityController.php b/modules/system/traits/SecurityController.php
index d96a7ca16..66da07ee8 100644
--- a/modules/system/traits/SecurityController.php
+++ b/modules/system/traits/SecurityController.php
@@ -82,8 +82,7 @@ trait SecurityController
             return true;
         }
 
-        // @todo if year >= 2018 change default from false to null
-        $forceSecure = Config::get('cms.backendForceSecure', false);
+        $forceSecure = Config::get('cms.backendForceSecure', null);
         if ($forceSecure === null) {
             $forceSecure = !Config::get('app.debug', false);
         }