From c914013287f3dd1e7d5dfb2e8399da01900928c8 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Wed, 18 Mar 2009 02:47:14 +0000 Subject: [PATCH] BUGFIX Existence check for Member autologin token (Merged from r73253) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73278 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- security/Member.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/Member.php b/security/Member.php index 3aa221225..f9cb1e38c 100644 --- a/security/Member.php +++ b/security/Member.php @@ -152,7 +152,8 @@ class Member extends DataObject { $member = DataObject::get_one("Member", "Member.ID = '$SQL_uid'"); - if($member && $member->RememberLoginToken != $token) { + // check if autologin token matches + if($member && (!$member->RememberLoginToken || $member->RememberLoginToken != $token)) { $member = null; }