From: Gergő Tisza <tgr.huwiki@gmail.com>
Date: Wed, 10 Feb 2016 21:55:35 +0000 (-0800)
Subject: Fix invalid key warning in CookieSessionProvider error handling code
X-Git-Tag: 1.31.0-rc.0~7980^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=0b54186340447ccd74fe608f96f72feb7042ed79;p=lhc%2Fweb%2Fwiklou.git

Fix invalid key warning in CookieSessionProvider error handling code

Change-Id: I68172ff5fcd6acaab7ecf298ed4a47f23cb8c9f7
---

diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php
index 3177dc2363..f55c589036 100644
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -103,15 +103,15 @@ class CookieSessionProvider extends SessionProvider {
 	}
 
 	public function provideSessionInfo( WebRequest $request ) {
+		$sessionId = $this->getCookie( $request, $this->params['sessionName'], '' );
 		$info = array(
-			'id' => $this->getCookie( $request, $this->params['sessionName'], '' ),
 			'provider' => $this,
 			'forceHTTPS' => $this->getCookie( $request, 'forceHTTPS', '', false )
 		);
-		if ( !SessionManager::validateSessionId( $info['id'] ) ) {
-			unset( $info['id'] );
+		if ( SessionManager::validateSessionId( $sessionId ) ) {
+			$info['id'] = $sessionId;
+			$info['persisted'] = true;
 		}
-		$info['persisted'] = isset( $info['id'] );
 
 		list( $userId, $userName, $token ) = $this->getUserInfoFromCookies( $request );
 		if ( $userId !== null ) {
@@ -126,7 +126,7 @@ class CookieSessionProvider extends SessionProvider {
 				$this->logger->warning(
 					'Session "{session}" requested with mismatched UserID and UserName cookies.',
 					array(
-						'session' => $info['id'],
+						'session' => $sessionId,
 						'mismatch' => array(
 							'userid' => $userId,
 							'cookie_username' => $userName,
@@ -141,7 +141,7 @@ class CookieSessionProvider extends SessionProvider {
 					$this->logger->warning(
 						'Session "{session}" requested with invalid Token cookie.',
 						array(
-							'session' => $info['id'],
+							'session' => $sessionId,
 							'userid' => $userId,
 							'username' => $userInfo->getName(),
 					 ) );