Session tempdata fix for 7.1

codeigniter4 · Jan 19, 2017 · c8d5436 · c8d5436
1 parent 5f13ed2
commit c8d5436
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/system/Session/Session.php b/system/Session/Session.php
@@ -850,6 +850,10 @@ public function markAsTempdata($key, $ttl = 300)
 					$k = $v;
 					$v = $ttl;
 				}
+				elseif (is_string($v))
+                {
+                    $v = time() + $ttl;
+                }
 				else
 				{
 					$v += time();

diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
@@ -314,6 +314,9 @@ public function testSetTempDataArraySingleTTL()
         $this->assertTrue(($time + 200) <= $_SESSION['__ci_vars']['baz']);
     }
 
+    /**
+     * @group single
+     */
     public function testGetTestDataReturnsAll()
     {
         $session = $this->getInstance();