Merge pull request #3304 from Shakespeare2000/feature/session

#3073 Fix write() for session_regenerate_id(TRUE)

1 files changed, 5 insertions, 5 deletions

diff --git a/system/libraries/Session/drivers/Session_database_driver.php b/system/libraries/Session/drivers/Session_database_driver.php
index 9e74605bc..efdec40e5 100644
--- a/system/libraries/Session/drivers/Session_database_driver.php
+++ b/system/libraries/Session/drivers/Session_database_driver.php
@@ -141,12 +141,8 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
 
 	public function write($session_id, $session_data)
 	{
-		if ($this->_lock === FALSE)
-		{
-			return FALSE;
-		}
 		// Was the ID regenerated?
-		elseif ($session_id !== $this->_session_id)
+		if ($session_id !== $this->_session_id)
 		{
 			if ( ! $this->_release_lock() OR ! $this->_get_lock($session_id))
 			{
@@ -156,6 +152,10 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
 			$this->_row_exists = FALSE;
 			$this->_session_id = $session_id;
 		}
+		elseif ($this->_lock === FALSE)
+		{
+			return FALSE;
+		}
 
 		if ($this->_row_exists === FALSE)
 		{