From a44002aefe01cc485c161d69f264ef4f96c12a9a Mon Sep 17 00:00:00 2001
From: Graham Eames <grahamje@users.sourceforge.net>
Date: Thu, 18 May 2006 19:23:07 +0000
Subject: [PATCH] Fix removal of old session keys under particular
 circumstances

git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@5930 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/sessions.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php
index 1164d6fae3..f2557b8741 100644
--- a/phpBB/includes/sessions.php
+++ b/phpBB/includes/sessions.php
@@ -367,6 +367,12 @@ function session_pagestart($user_ip, $thispage_id)
 					setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
 				}
 
+				// Add the session_key to the userdata array if it is set
+				if ( isset($sessiondata['autologinid']) && $sessiondata['autologinid'] != '' )
+				{
+					$userdata['session_key'] = $sessiondata['autologinid'];
+				}
+
 				return $userdata;
 			}
 		}