diff options
| author | rvelices <rv-github@modusoptimus.com> | 2006-04-21 02:10:45 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2006-04-21 02:10:45 +0000 |
| commit | 01f06a878ff37f734e2fa9887ee88a28d125e4ce (patch) | |
| tree | 0d61324199640d23ee9f5e2cbdb191ee67aa9dca | |
| parent | d637dbbe1d94f9e503bce3c0c5497accfa2728cd (diff) | |
bugs 344 and 308: broken user id in $_SESSION due to php.ini register_globals
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1230 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/functions_user.inc.php | 2 | ||||
| -rw-r--r-- | include/user.inc.php | 4 |
2 files changed, 3 insertions, 3 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; } /* diff --git a/include/user.inc.php b/include/user.inc.php index 83d86a6c7..b1ec2f879 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -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 |