From 4d73790a1b6194c024f4cc159311b260349df6a0 Mon Sep 17 00:00:00 2001 From: rvelices Date: Fri, 21 Apr 2006 02:11:29 +0000 Subject: 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 --- include/functions_user.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/functions_user.inc.php') 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; } /* -- cgit v1.2.3