From 2e73b5eeca692f015d63539322dccf62e25cf72a Mon Sep 17 00:00:00 2001
From: Thomas Portelange <thomas@lekoala.be>
Date: Thu, 22 Jun 2023 11:04:26 +0200
Subject: [PATCH 1/2] Use cached query

Fixes https://github.com/silverstripe/silverstripe-framework/issues/10833
---
 .../MemberAuthenticator/SessionAuthenticationHandler.php       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php b/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php
index c2fbd399c..ef5008ee6 100644
--- a/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php
+++ b/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php
@@ -4,6 +4,7 @@ namespace SilverStripe\Security\MemberAuthenticator;
 
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Cookie;
+use SilverStripe\ORM\DataObject;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Security\AuthenticationHandler;
@@ -59,7 +60,7 @@ class SessionAuthenticationHandler implements AuthenticationHandler
             return null;
         }
         /** @var Member $member */
-        $member = Member::get()->byID($id);
+        $member = DataObject::get_by_id("SilverStripe\\Security\\Member", $id);
         return $member;
     }
 

From 9391e696bbb4e12f58c52f3335b15b0e157cc2c1 Mon Sep 17 00:00:00 2001
From: Thomas Portelange <thomas@lekoala.be>
Date: Fri, 23 Jun 2023 09:35:34 +0200
Subject: [PATCH 2/2] use Member::class

---
 .../MemberAuthenticator/SessionAuthenticationHandler.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php b/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php
index ef5008ee6..a192f7a71 100644
--- a/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php
+++ b/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php
@@ -60,7 +60,7 @@ class SessionAuthenticationHandler implements AuthenticationHandler
             return null;
         }
         /** @var Member $member */
-        $member = DataObject::get_by_id("SilverStripe\\Security\\Member", $id);
+        $member = DataObject::get_by_id(Member::class, $id);
         return $member;
     }