GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

check session name COOKIE before ensuring session

Browse Source 
darcs-hash:20080624034906-34904-a21bab1db498d69c616606126f6b788a2188b1e2.gz
This commit is contained in:
Evan Prodromou 2008-06-23 23:49:06 -04:00
parent 25a6f240a4
commit 1db5ba0576
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/util.php
View File

@ -506,15 +506,15 @@ function common_forgetme() {
# who is the current user?
function common_current_user() {
common_ensure_session();
$id = $_SESSION['userid'];
if ($id) {
# note: this should cache
$user = User::staticGet($id);
return $user;
if ($_REQUEST[session_name()]) {
common_ensure_session();
$id = $_SESSION['userid'];
if ($id) {
# note: this should cache
$user = User::staticGet($id);
return $user;
}
}
# that didn't work; try to remember
$user = common_remembered_user();
return $user;