Run SessionHandler::write() into a transaction

1 files changed, 13 insertions, 7 deletions

diff --git a/app/Core/Session/SessionHandler.php b/app/Core/Session/SessionHandler.php
index 135e0ab0..df32a74e 100644
--- a/app/Core/Session/SessionHandler.php
+++ b/app/Core/Session/SessionHandler.php
@@ -54,17 +54,23 @@ class SessionHandler implements SessionHandlerInterface
     {
         $lifetime = time() + (ini_get('session.gc_maxlifetime') ?: 1440);
 
+        $this->db->startTransaction();
+
         if ($this->db->table(self::TABLE)->eq('id', $sessionID)->exists()) {
-            return $this->db->table(self::TABLE)->eq('id', $sessionID)->update(array(
+            $this->db->table(self::TABLE)->eq('id', $sessionID)->update([
+                'expire_at' => $lifetime,
+                'data'      => $data,
+            ]);
+        } else {
+            $this->db->table(self::TABLE)->insert([
+                'id'        => $sessionID,
                 'expire_at' => $lifetime,
                 'data'      => $data,
-            ));
+            ]);
         }
 
-        return $this->db->table(self::TABLE)->insert(array(
-            'id'        => $sessionID,
-            'expire_at' => $lifetime,
-            'data'      => $data,
-        ));
+        $this->db->closeTransaction();
+
+        return true;
     }
 }