From 9d9849b2c459cb09ccebcdf89b2b3a15bc4fd722 Mon Sep 17 00:00:00 2001 From: Johnathan Croom Date: Sat, 24 Nov 2012 13:03:13 -0700 Subject: Requested changed to keep_flashdata --- system/libraries/Session/Session.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'system/libraries') diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php index 81d63c304..910b99936 100644 --- a/system/libraries/Session/Session.php +++ b/system/libraries/Session/Session.php @@ -389,18 +389,18 @@ class CI_Session extends CI_Driver_Library { /** * Keeps existing flashdata available to next request. * - * @param mixed Item key + * @param mixed Item key(s) * @return void */ public function keep_flashdata($data) { // Wrap item as array if singular - if (is_string($data)) + if (!is_array($data)) { $data = array($data); } - foreach($data as $key) + foreach ($data as $key) { // 'old' flashdata gets removed. Here we mark all flashdata as 'new' to preserve it from _flashdata_sweep() // Note the function will return NULL if the $key provided cannot be found @@ -410,7 +410,6 @@ class CI_Session extends CI_Driver_Library { $new_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key; $this->set_userdata($new_flashdata_key, $value); } - } // ------------------------------------------------------------------------ -- cgit v1.2.3-24-g4f1b