tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix some database errors during dev/build where an auth token exists for the current user

Browse Source 
Fixes #3660
This commit is contained in:
Damian Mooyman 2015-03-25 11:34:13 +13:00
parent ed4db4f135
commit 8d6cd1529f
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
security/Member.php
View File

@ -520,11 +520,16 @@ class Member extends DataObject implements TemplateGlobalProvider {
// Don't bother trying this multiple times // Don't bother trying this multiple times
self::$_already_tried_to_auto_log_in = true; self::$_already_tried_to_auto_log_in = true;
if(strpos(Cookie::get('alc_enc'), ':') && !Session::get("loggedInAs")) { if(strpos(Cookie::get('alc_enc'), ':') === false
list($uid, $token) = explode(':', Cookie::get('alc_enc'), 2); || Session::get("loggedInAs")
$SQL_uid = Convert::raw2sql($uid); || !Security::database_is_ready()
) {
return;
}
$member = DataObject::get_one("Member", "\"Member\".\"ID\" = '$SQL_uid'"); list($uid, $token) = explode(':', Cookie::get('alc_enc'), 2);
$member = DataObject::get_by_id("Member", $uid);
// check if autologin token matches // check if autologin token matches
if($member) { if($member) {
@ -555,7 +560,6 @@ class Member extends DataObject implements TemplateGlobalProvider {
$member->extend('memberAutoLoggedIn'); $member->extend('memberAutoLoggedIn');
} }
} }
}
/** /**
* Logs this member out. * Logs this member out.