From c5536aac5752054f7f76e448d58b86407d8f574e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Thu, 1 Nov 2012 17:33:58 +0200
Subject: Manually apply PR #1594 (fixing phpdoc page-level
 generation/warnings)

Also partially fixes issue #1295, fixes inconsistencies in some page-level docblocks and adds include checks in language files.
---
 system/libraries/Session/Session.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index fec9b5b31..fb5b9fdd3 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
 /**
  * CodeIgniter
  *
@@ -18,12 +18,13 @@
  *
  * @package		CodeIgniter
  * @author		EllisLab Dev Team
- * @copyright	Copyright (c) 2006 - 2012 EllisLab, Inc.
+ * @copyright	Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
  * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 2.0
  * @filesource
  */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * CodeIgniter Session Class
-- 
cgit v1.2.3-24-g4f1b


From 0fa95bd5a7215da06f332c91f5857f563a1cce3d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Thu, 1 Nov 2012 23:33:14 +0200
Subject: [ci skip] DocBlocks for Pagination, Session, Trackback, Jquery
 libraries

Partially fixes issue #1295
---
 system/libraries/Session/Session.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index fb5b9fdd3..bb13c3376 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -52,10 +52,29 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  */
 class CI_Session extends CI_Driver_Library {
 
+	/**
+	 * Initialization parameters
+	 *
+	 * @var	array
+	 */
 	public $params = array();
+
+	/**
+	 * Current driver in use
+	 *
+	 * @var	string
+	 */
 	protected $current = NULL;
+
+	/**
+	 * User data
+	 *
+	 * @var	array
+	 */
 	protected $userdata = array();
 
+	// ------------------------------------------------------------------------
+
 	const FLASHDATA_KEY = 'flash';
 	const FLASHDATA_NEW = ':new:';
 	const FLASHDATA_OLD = ':old:';
@@ -63,6 +82,8 @@ class CI_Session extends CI_Driver_Library {
 	const EXPIRATION_KEY = '__expirations';
 	const TEMP_EXP_DEF = 300;
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * CI_Session constructor
 	 *
@@ -596,8 +617,16 @@ class CI_Session extends CI_Driver_Library {
  */
 abstract class CI_Session_driver extends CI_Driver {
 
+	/**
+	 * CI Singleton
+	 *
+	 * @see	get_instance()
+	 * @var	object
+	 */
 	protected $CI;
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Constructor
 	 *
-- 
cgit v1.2.3-24-g4f1b


From e24eed7e4e410fabf7479a67d3a27e2596444505 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Fri, 2 Nov 2012 23:33:45 +0200
Subject: Some micro-optimizations

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index bb13c3376..96e65f154 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -528,7 +528,7 @@ class CI_Session extends CI_Driver_Library {
 		foreach ($this->all_userdata() as $name => $value)
 		{
 			$parts = explode(self::FLASHDATA_NEW, $name);
-			if (is_array($parts) && count($parts) === 2)
+			if (count($parts) === 2)
 			{
 				$new_name = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$parts[1];
 				$this->set_userdata($new_name, $value);
-- 
cgit v1.2.3-24-g4f1b