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
silverstripe · Feb 2, 2011 · c914013 · c914013
1 parent 2ab2acc
commit c914013
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/security/Member.php b/security/Member.php
@@ -152,7 +152,8 @@ static function autoLogin() {
 
 			$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;
 			}