merge r1230 from branch-1_6 into trunk
bugs 344 and 308: broken user id in $_SESSION due to php.ini register_globals git-svn-id: http://piwigo.org/svn/trunk@1231 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
c000b9ed60
commit
4d73790a1b
2 changed files with 8 additions and 8 deletions
|
@ -544,7 +544,7 @@ function log_user($user_id, $remember_me)
|
|||
}
|
||||
session_set_cookie_params($session_length);
|
||||
session_start();
|
||||
$_SESSION['id'] = $user_id;
|
||||
$_SESSION['pwg_uid'] = $user_id;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -29,9 +29,9 @@
|
|||
if (isset($_COOKIE[session_name()]))
|
||||
{
|
||||
session_start();
|
||||
if (isset($_SESSION['id']))
|
||||
if (isset($_SESSION['pwg_uid']))
|
||||
{
|
||||
$user['id'] = $_SESSION['id'];
|
||||
$user['id'] = $_SESSION['pwg_uid'];
|
||||
$user['is_the_guest'] = false;
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Reference in a new issue