diff options
author | rvelices <rv-github@modusoptimus.com> | 2006-04-21 02:11:29 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2006-04-21 02:11:29 +0000 |
commit | 4d73790a1b6194c024f4cc159311b260349df6a0 (patch) | |
tree | 833f62fe236067cf4bd9620aa2d68065b88a546b /include/functions_user.inc.php | |
parent | c000b9ed60d13c1a40df39f4d5f16bbd5bfd92b0 (diff) |
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
Diffstat (limited to '')
-rw-r--r-- | include/functions_user.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index c5efa98ad..0965467ce 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -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; } /* |