commit 38344dc980a438db8618582e0174a00bdb2fd94c
author Heesung Ahn <ahn.heesung@gmail.com> Mon Mar 30 12:08:24 2015 -0400
committer Heesung Ahn <ahn.heesung@gmail.com> Mon Mar 30 12:08:24 2015 -0400
tree 1a30f3afcefeb7e8d3e85c9ece2b94954ed36e6e
parent fc67a701a574641b5dfd7afe00d4c5d403111626
parent fd3105716f5cdede79b9b471561413c161db250c

Merge origin/develop into UnitTest_Lang_test

system/libraries/Session/Session.php

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index bb457c6..0549fef 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -869,7 +869,7 @@
 	public function set_tempdata($data, $value = NULL, $ttl = 300)
 	{
 		$this->set_userdata($data, $value);
-		$this->mark_as_temp($data, $ttl);
+		$this->mark_as_temp(is_array($data) ? array_keys($data) : $data, $ttl);
 	}
 
 	// ------------------------------------------------------------------------