From acb4051cde566edac3495e39dd91b47122475609 Mon Sep 17 00:00:00 2001
From: Andjelko Horvat <comel@vingd.com>
Date: Wed, 11 Sep 2013 15:09:24 +0000
Subject: [PATCH] SimpleSAML_SessionHandlerPHP::newSessionId(): cleaner version
 for r3273.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3274 44740490-163a-0410-bde0-09ae8108e29a
---
 lib/SimpleSAML/SessionHandlerPHP.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index 5b6ef5619..17480b68c 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -73,12 +73,12 @@ class SimpleSAML_SessionHandlerPHP extends SimpleSAML_SessionHandler {
 		$sessionId = SimpleSAML_Utilities::stringToHex(SimpleSAML_Utilities::generateRandomBytes(16));
 		SimpleSAML_Session::createSession($sessionId);
 
-		if (session_id($sessionId) !== '') {
+		if (session_id() !== '') {
 			/* Session already started, close it. */
 			session_write_close();
-			session_id($sessionId);
 		}
 
+		session_id($sessionId);
 		session_start();
 
 		return session_id();
-- 
GitLab