From d3e9273de9af35bcbff77c251ca23bd621eecfb5 Mon Sep 17 00:00:00 2001 From: Michiel Vugteveen Date: Tue, 7 Aug 2018 15:23:21 +0200 Subject: fix #5545 --- system/libraries/Session/Session_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/libraries/Session/Session_driver.php') diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php index 2fe30b8a2..a26b3a328 100644 --- a/system/libraries/Session/Session_driver.php +++ b/system/libraries/Session/Session_driver.php @@ -121,7 +121,7 @@ abstract class CI_Session_driver implements SessionHandlerInterface { */ public function php5_validate_id() { - if (PHP_VERSION_ID < 70000 && isset($_COOKIE[$this->_config['cookie_name']]) && ! $this->validateId($_COOKIE[$this->_config['cookie_name']])) + if (isset($_COOKIE[$this->_config['cookie_name']]) && ! $this->validateSessionId($_COOKIE[$this->_config['cookie_name']])) { unset($_COOKIE[$this->_config['cookie_name']]); } -- cgit v1.2.3-24-g4f1b From 99225a032c1f2ab5bffba870da8d053b22b92725 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 22 Aug 2018 14:28:44 +0300 Subject: [ci skip] Changelog entry for #5545, PR #5563 --- system/libraries/Session/Session_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/libraries/Session/Session_driver.php') diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php index a26b3a328..d6eab9be3 100644 --- a/system/libraries/Session/Session_driver.php +++ b/system/libraries/Session/Session_driver.php @@ -115,7 +115,7 @@ abstract class CI_Session_driver implements SessionHandlerInterface { /** * PHP 5.x validate ID * - * Enforces session.use_strict_mode on PHP 5.x (7+ does it by itself) + * Enforces session.use_strict_mode * * @return void */ -- cgit v1.2.3-24-g4f1b From 0e59db6c207b3108565ef4ab6c18b81353478d91 Mon Sep 17 00:00:00 2001 From: "Instructor, BCIT" Date: Tue, 1 Jan 2019 08:34:36 -0800 Subject: Merge pull request #5662 from jim-parry/copyright2019 Update copyright date to 2019 --- system/libraries/Session/Session_driver.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'system/libraries/Session/Session_driver.php') diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php index d6eab9be3..14ebdb09f 100644 --- a/system/libraries/Session/Session_driver.php +++ b/system/libraries/Session/Session_driver.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2018, British Columbia Institute of Technology + * Copyright (c) 2014 - 2019, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,8 +29,8 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) - * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/) - * @license http://opensource.org/licenses/MIT MIT License + * @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License * @link https://codeigniter.com * @since Version 3.0.0 * @filesource -- cgit v1.2.3-24-g4f1b