From ca20d8445312e49e1e974c5ed8cf04400929e615 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sat, 27 Oct 2012 03:02:38 +0300
Subject: Fix #50

---
 system/libraries/Session/drivers/Session_cookie.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'system/libraries/Session')

diff --git a/system/libraries/Session/drivers/Session_cookie.php b/system/libraries/Session/drivers/Session_cookie.php
index 8617aec2d..2f1bf3531 100755
--- a/system/libraries/Session/drivers/Session_cookie.php
+++ b/system/libraries/Session/drivers/Session_cookie.php
@@ -223,9 +223,6 @@ class CI_Session_cookie extends CI_Session_driver {
 			show_error('In order to use the Cookie Session driver you are required to set an encryption key in your config file.');
 		}
 
-		// Load the string helper so we can use the strip_slashes() function
-		$this->CI->load->helper('string');
-
 		// Do we need encryption? If so, load the encryption class
 		if ($this->sess_encrypt_cookie === TRUE)
 		{
@@ -755,7 +752,7 @@ class CI_Session_cookie extends CI_Session_driver {
 	 */
 	protected function _unserialize($data)
 	{
-		$data = @unserialize(strip_slashes(trim($data)));
+		$data = @unserialize(trim($data));
 
 		if (is_array($data))
 		{
-- 
cgit v1.2.3-24-g4f1b


From 2b5b92e6535fb328bf4fbe75396c80e352b7c3a2 Mon Sep 17 00:00:00 2001
From: vkeranov <vkeranov@gmail.com>
Date: Sat, 27 Oct 2012 18:01:47 +0300
Subject: Remove extra space...

---
 system/libraries/Session/drivers/Session_native.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Session')

diff --git a/system/libraries/Session/drivers/Session_native.php b/system/libraries/Session/drivers/Session_native.php
index da744f39b..a837b89f6 100755
--- a/system/libraries/Session/drivers/Session_native.php
+++ b/system/libraries/Session/drivers/Session_native.php
@@ -1,4 +1,4 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
-- 
cgit v1.2.3-24-g4f1b


From 3bb4029bbe0db9625be21e2dad82ef18286560ca Mon Sep 17 00:00:00 2001
From: vkeranov <vkeranov@gmail.com>
Date: Sat, 27 Oct 2012 18:47:26 +0300
Subject: Remove extra spaces...

---
 system/libraries/Session/Session.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/libraries/Session')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 978506062..fec9b5b31 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -1,4 +1,4 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -86,7 +86,7 @@ class CI_Session extends CI_Driver_Library {
 		// Get valid drivers list
 		$this->valid_drivers = array(
 			'Session_native',
-		   	'Session_cookie'
+			'Session_cookie'
 		);
 		$key = 'sess_valid_drivers';
 		$drivers = isset($params[$key]) ? $params[$key] : $CI->config->item($key);
@@ -243,7 +243,7 @@ class CI_Session extends CI_Driver_Library {
 	/**
 	 * Fetch all flashdata
 	 *
-	 * @return	array   Flash data array
+	 * @return	array	Flash data array
 	 */
 	public function all_flashdata()
 	{
-- 
cgit v1.2.3-24-g4f1b