From 5b0e1f222cc96ed55d524008e1edcf9058e5132d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 19 Jun 2017 11:29:39 +0300 Subject: [ci skip] Prepare 3.1.5 release --- composer.json | 2 +- system/core/CodeIgniter.php | 2 +- user_guide_src/source/changelog.rst | 4 ++-- user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 0a898d2c1..c40d549c9 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "source": "https://github.com/bcit-ci/CodeIgniter" }, "require": { - "php": ">=5.2.4" + "php": ">=5.3.7" }, "suggest": { "paragonie/random_compat": "Provides better randomness in PHP 5.x" diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 0fab092e5..823e034d7 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @var string * */ - const CI_VERSION = '3.1.5-dev'; + const CI_VERSION = '3.1.5'; /* * ------------------------------------------------------ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 4695edc72..21a1c0c44 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -5,7 +5,7 @@ Change Log Version 3.1.5 ============= -Release Date: Not Released +Release Date: Jun 19, 2017 - **Security** @@ -28,7 +28,7 @@ Bug fixes for 3.1.5 Version 3.1.4 ============= -Release Date: March 20, 2017 +Release Date: Mar 20, 2017 - **Security** diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index f3d477591..c233b3a06 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2017, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.5-dev' +version = '3.1.5' # The full version, including alpha/beta/rc tags. -release = '3.1.5-dev' +release = '3.1.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index fd4f90753..4cd824f0c 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,7 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.5-dev (Current version) `_ +- `CodeIgniter v3.1.5 (Current version) `_ - `CodeIgniter v3.1.4 `_ - `CodeIgniter v3.1.3 `_ - `CodeIgniter v3.1.2 `_ -- cgit v1.2.3-24-g4f1b From 47f540e82cbc1591cc7f1aa92d47a8c8c4028c63 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 19 Jun 2017 11:38:25 +0300 Subject: [ci skip] Starting 3.1.6-dev --- system/core/CodeIgniter.php | 2 +- user_guide_src/source/changelog.rst | 6 ++++++ user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 3 ++- user_guide_src/source/installation/upgrade_316.rst | 14 ++++++++++++++ user_guide_src/source/installation/upgrading.rst | 1 + 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 user_guide_src/source/installation/upgrade_316.rst diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 823e034d7..f5ffc5ddd 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @var string * */ - const CI_VERSION = '3.1.5'; + const CI_VERSION = '3.1.6-dev'; /* * ------------------------------------------------------ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 21a1c0c44..3012b9eb2 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2,6 +2,12 @@ Change Log ########## +Version 3.1.6 +============= + +Release Date: Not Released + + Version 3.1.5 ============= diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index c233b3a06..f783d67e7 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2017, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.5' +version = '3.1.6-dev' # The full version, including alpha/beta/rc tags. -release = '3.1.5' +release = '3.1.6-dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 4cd824f0c..23c500e12 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -2,7 +2,8 @@ Downloading CodeIgniter ####################### -- `CodeIgniter v3.1.5 (Current version) `_ +- `CodeIgniter v3.1.6-dev (Current version) `_ +- `CodeIgniter v3.1.5 `_ - `CodeIgniter v3.1.4 `_ - `CodeIgniter v3.1.3 `_ - `CodeIgniter v3.1.2 `_ diff --git a/user_guide_src/source/installation/upgrade_316.rst b/user_guide_src/source/installation/upgrade_316.rst new file mode 100644 index 000000000..e382c20ab --- /dev/null +++ b/user_guide_src/source/installation/upgrade_316.rst @@ -0,0 +1,14 @@ +############################# +Upgrading from 3.1.5 to 3.1.6 +############################# + +Before performing an update you should take your site offline by +replacing the index.php file with a static one. + +Step 1: Update your CodeIgniter files +===================================== + +Replace all files and directories in your *system/* directory. + +.. note:: If you have any custom developed files in these directories, + please make copies of them first. diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index 8f30e1a01..991d5cf4c 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -8,6 +8,7 @@ upgrading from. .. toctree:: :titlesonly: + Upgrading from 3.1.5 to 3.1.6 Upgrading from 3.1.4 to 3.1.5 Upgrading from 3.1.3 to 3.1.4 Upgrading from 3.1.2 to 3.1.3 -- cgit v1.2.3-24-g4f1b From 763b7703ee744b65878bbf721fce3e5ec4dfac82 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 26 Jun 2017 10:26:33 +0300 Subject: [ci skip] Merge pull request #5162 from hex-ci/patch-3 Fix a spelling typo in security docs --- user_guide_src/source/libraries/security.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst index fc5cba19d..868112684 100644 --- a/user_guide_src/source/libraries/security.rst +++ b/user_guide_src/source/libraries/security.rst @@ -107,7 +107,7 @@ Class Reference If the optional second parameter is set to true, it will return boolean TRUE if the image is safe to use and FALSE if malicious data was detected in it. - .. important:: This method is not suitable for filtering HTML attribute vales! + .. important:: This method is not suitable for filtering HTML attribute values! Use :php:func:`html_escape()` for that instead. .. php:method:: sanitize_filename($str[, $relative_path = FALSE]) -- cgit v1.2.3-24-g4f1b From 894a3f2c9fe111af35dee4f5e8e711259b893fb6 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 27 Jun 2017 16:31:17 +0300 Subject: Fix #5164 --- system/core/Loader.php | 41 +++++++++++++++++++------------------ user_guide_src/source/changelog.rst | 5 +++++ 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/system/core/Loader.php b/system/core/Loader.php index 5ed6adb48..7be5fd41b 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -1037,6 +1037,26 @@ class CI_Loader { return $this->_ci_load_stock_library($class, $subdir, $params, $object_name); } + // Safety: Was the class already loaded by a previous call? + if (class_exists($class, FALSE)) + { + $property = $object_name; + if ( ! isset($property)) + { + $property = strtolower($class); + isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$object_name]; + } + + $CI =& get_instance(); + if (isset($CI->$property)) + { + log_message('debug', $class.' class already loaded. Second attempt ignored.'); + return; + } + + return $this->_ci_init_library($class, '', $params, $object_name); + } + // Let's search for the requested library file and load it. foreach ($this->_ci_library_paths as $path) { @@ -1047,27 +1067,8 @@ class CI_Loader { } $filepath = $path.'libraries/'.$subdir.$class.'.php'; - - // Safety: Was the class already loaded by a previous call? - if (class_exists($class, FALSE)) - { - // Before we deem this to be a duplicate request, let's see - // if a custom object name is being supplied. If so, we'll - // return a new instance of the object - if ($object_name !== NULL) - { - $CI =& get_instance(); - if ( ! isset($CI->$object_name)) - { - return $this->_ci_init_library($class, '', $params, $object_name); - } - } - - log_message('debug', $class.' class already loaded. Second attempt ignored.'); - return; - } // Does the file exist? No? Bummer... - elseif ( ! file_exists($filepath)) + if ( ! file_exists($filepath)) { continue; } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 3012b9eb2..fd7485f64 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -8,6 +8,11 @@ Version 3.1.6 Release Date: Not Released +Bug fixes for 3.1.6 +------------------- + +- Fixed a bug (#5164) - :doc:`Loader Library ` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name. + Version 3.1.5 ============= -- cgit v1.2.3-24-g4f1b From db89c20721b3b66671db9ff4d3b6c9a6de352533 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 28 Jun 2017 11:18:24 +0300 Subject: Correct fix for #5164 894a3f2c9fe111af35dee4f5e8e711259b893fb6 --- system/core/Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/Loader.php b/system/core/Loader.php index 7be5fd41b..cae01ed38 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -1044,7 +1044,7 @@ class CI_Loader { if ( ! isset($property)) { $property = strtolower($class); - isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$object_name]; + isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property]; } $CI =& get_instance(); -- cgit v1.2.3-24-g4f1b From be0280d02a408a8b4aeb6aee10d9dd936f978ce2 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 28 Jun 2017 11:49:01 +0300 Subject: #5164 fix for stock libraries --- system/core/Loader.php | 21 +++++++++++---------- tests/codeigniter/core/Loader_test.php | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/system/core/Loader.php b/system/core/Loader.php index cae01ed38..12922ca64 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -1041,7 +1041,7 @@ class CI_Loader { if (class_exists($class, FALSE)) { $property = $object_name; - if ( ! isset($property)) + if (empty($property)) { $property = strtolower($class); isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property]; @@ -1113,16 +1113,17 @@ class CI_Loader { $prefix = config_item('subclass_prefix'); } - // Before we deem this to be a duplicate request, let's see - // if a custom object name is being supplied. If so, we'll - // return a new instance of the object - if ($object_name !== NULL) + $property = $object_name; + if (empty($property)) { - $CI =& get_instance(); - if ( ! isset($CI->$object_name)) - { - return $this->_ci_init_library($library_name, $prefix, $params, $object_name); - } + $property = strtolower($library_name); + isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property]; + } + + $CI =& get_instance(); + if ( ! isset($CI->$property)) + { + return $this->_ci_init_library($library_name, $prefix, $params, $object_name); } log_message('debug', $library_name.' class already loaded. Second attempt ignored.'); diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php index 241c415b3..8c5bb3021 100644 --- a/tests/codeigniter/core/Loader_test.php +++ b/tests/codeigniter/core/Loader_test.php @@ -99,7 +99,7 @@ class Loader_test extends CI_TestCase { // Test reloading unset($this->ci_obj->$name); $this->assertInstanceOf('CI_Loader', $this->load->library($lib)); - $this->assertObjectNotHasAttribute($name, $this->ci_obj); + $this->assertObjectHasAttribute($name, $this->ci_obj); // Create baseless library $name = 'ext_baseless_lib'; -- cgit v1.2.3-24-g4f1b From c58b005c5497419dd7ab79fc29ac7e5344c95039 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 28 Jun 2017 11:50:27 +0300 Subject: [ci skip] Remove redundant elses from CI_Loader::_ci_load_stock_library() --- system/core/Loader.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/system/core/Loader.php b/system/core/Loader.php index 12922ca64..df93d591f 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -1145,10 +1145,8 @@ class CI_Loader { { return $this->_ci_init_library($library_name, $prefix, $params, $object_name); } - else - { - log_message('debug', $path.' exists, but does not declare '.$prefix.$library_name); - } + + log_message('debug', $path.' exists, but does not declare '.$prefix.$library_name); } } @@ -1166,10 +1164,8 @@ class CI_Loader { $prefix = config_item('subclass_prefix'); break; } - else - { - log_message('debug', $path.' exists, but does not declare '.$subclass); - } + + log_message('debug', $path.' exists, but does not declare '.$subclass); } } -- cgit v1.2.3-24-g4f1b From 7af882026c476f2a64376512b33ff890d2792a8d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 3 Jul 2017 14:00:48 +0300 Subject: [ci skip] Drop application/cache/.htaccess; close #5169 --- .gitignore | 4 ++-- application/cache/.htaccess | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 application/cache/.htaccess diff --git a/.gitignore b/.gitignore index eb45390e9..96bce5941 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,11 @@ application/cache/* !application/cache/index.html -!application/cache/.htaccess application/logs/* !application/logs/index.html -!application/logs/.htaccess + +!application/*/.htaccess composer.lock diff --git a/application/cache/.htaccess b/application/cache/.htaccess deleted file mode 100644 index 6c63ed4c4..000000000 --- a/application/cache/.htaccess +++ /dev/null @@ -1,6 +0,0 @@ - - Require all denied - - - Deny from all - \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 59bae57503865f6dcea91fc20fd2729b2e79bb74 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 3 Jul 2017 14:13:08 +0300 Subject: [ci skip] Fix #5168 --- system/database/DB_query_builder.php | 14 ++++++-------- user_guide_src/source/changelog.rst | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 9216651aa..7677f5b40 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1403,11 +1403,9 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // ORDER BY usage is often problematic here (most notably // on Microsoft SQL Server) and ultimately unnecessary // for selecting COUNT(*) ... - if ( ! empty($this->qb_orderby)) - { - $orderby = $this->qb_orderby; - $this->qb_orderby = NULL; - } + $qb_orderby = $this->qb_order_by; + $qb_cache_orderby = $this->qb_cache_orderby; + $this->qb_orderby = $this->qb_cache_orderby = NULL; $result = ($this->qb_distinct === TRUE OR ! empty($this->qb_groupby) OR ! empty($this->qb_cache_groupby) OR $this->qb_limit OR $this->qb_offset) ? $this->query($this->_count_string.$this->protect_identifiers('numrows')."\nFROM (\n".$this->_compile_select()."\n) CI_count_all_results") @@ -1417,10 +1415,10 @@ abstract class CI_DB_query_builder extends CI_DB_driver { { $this->_reset_select(); } - // If we've previously reset the qb_orderby values, get them back - elseif ( ! isset($this->qb_orderby)) + else { - $this->qb_orderby = $orderby; + $this->qb_orderby = $qb_orderby; + $this->qb_cache_orderby = $qb_cache_orderby; } if ($result->num_rows() === 0) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index fd7485f64..77648a937 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -12,6 +12,7 @@ Bug fixes for 3.1.6 ------------------- - Fixed a bug (#5164) - :doc:`Loader Library ` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name. +- Fixed a bug (#5168) - :doc:`Query Builder ` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached. Version 3.1.5 ============= -- cgit v1.2.3-24-g4f1b From fdf4b59e7734e3417c745a651382dec8bf556ed0 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 6 Jul 2017 11:49:13 +0300 Subject: [ci skip] Merge pull request #5170 from tianhe1986/develop_session_race_condition Decreasing the probability of race condition in session lock --- system/libraries/Session/drivers/Session_memcached_driver.php | 5 +++-- system/libraries/Session/drivers/Session_redis_driver.php | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php index 2556bf0f7..5e90539d7 100644 --- a/system/libraries/Session/drivers/Session_memcached_driver.php +++ b/system/libraries/Session/drivers/Session_memcached_driver.php @@ -310,7 +310,7 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa if ( ! $this->_memcached->replace($this->_lock_key, time(), 300)) { return ($this->_memcached->getResultCode() === Memcached::RES_NOTFOUND) - ? $this->_memcached->set($this->_lock_key, time(), 300) + ? $this->_memcached->add($this->_lock_key, time(), 300) : FALSE; } } @@ -326,7 +326,8 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa continue; } - if ( ! $this->_memcached->set($lock_key, time(), 300)) + $method = ($this->_memcached->getResultCode() === Memcached::RES_NOTFOUND) ? 'add' : 'set'; + if ( ! $this->_memcached->$method($lock_key, time(), 300)) { log_message('error', 'Session: Error while trying to obtain lock for '.$this->_key_prefix.$session_id); return FALSE; diff --git a/system/libraries/Session/drivers/Session_redis_driver.php b/system/libraries/Session/drivers/Session_redis_driver.php index e220a2951..a9e655a8c 100644 --- a/system/libraries/Session/drivers/Session_redis_driver.php +++ b/system/libraries/Session/drivers/Session_redis_driver.php @@ -341,7 +341,11 @@ class CI_Session_redis_driver extends CI_Session_driver implements SessionHandle continue; } - if ( ! $this->_redis->setex($lock_key, 300, time())) + $result = ($ttl === -2) + ? $this->_redis->set($lock_key, time(), array('nx', 'ex' => 300)) + : $this->_redis->setex($lock_key, 300, time()); + + if ( ! $result) { log_message('error', 'Session: Error while trying to obtain lock for '.$this->_key_prefix.$session_id); return FALSE; -- cgit v1.2.3-24-g4f1b From 93d759dd84dc1eefb5f968d70177973a84c1df70 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 6 Jul 2017 11:54:16 +0300 Subject: [ci skip] Add changelog entry for PR #5170 --- user_guide_src/source/changelog.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 77648a937..b1dc618b2 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,6 +7,10 @@ Version 3.1.6 Release Date: Not Released +- General Changes + + - Updated the :doc:`Session Library ` 'redis', 'memcached' drivers to reduce the potential of a locking race conditions. + Bug fixes for 3.1.6 ------------------- -- cgit v1.2.3-24-g4f1b From 9bceb9c7c83082cd3d3aa2c96e5eb8c210890ade Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 6 Jul 2017 15:12:09 +0300 Subject: [ci skip] Merge pull request #5173 from Syafiqq/develop Add array identifier for library loader docblock --- system/core/Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/Loader.php b/system/core/Loader.php index df93d591f..085c5b51d 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -182,7 +182,7 @@ class CI_Loader { * Loads and instantiates libraries. * Designed to be called from application controllers. * - * @param string $library Library name + * @param mixed $library Library name * @param array $params Optional parameters to pass to the library class constructor * @param string $object_name An optional object name to assign to * @return object -- cgit v1.2.3-24-g4f1b From 9c068a1cfca6fbafb1013f0966207ac65bd120ea Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 10 Jul 2017 14:40:06 +0300 Subject: [ci skip] Merge pull request #5128 from lloricode/profiler-pre-tag Profiler add pre tag --- system/libraries/Profiler.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 9ea09a529..cb3eaed75 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -484,13 +484,19 @@ class CI_Profiler { foreach ($this->CI->config->config as $config => $val) { + $pre = ''; + $pre_close = ''; + if (is_array($val) OR is_object($val)) { $val = print_r($val, TRUE); + + $pre = '
' ;
+ 				$pre_close = '
'; } $output .= '' - .$config.'  '.htmlspecialchars($val, ENT_QUOTES, config_item('charset'))."\n"; + .$config.'  '.$pre.htmlspecialchars($val, ENT_QUOTES, config_item('charset')).$pre_close."\n"; } return $output."\n"; @@ -516,13 +522,19 @@ class CI_Profiler { foreach ($this->CI->session->userdata() as $key => $val) { + $pre = ''; + $pre_close = ''; + if (is_array($val) OR is_object($val)) { $val = print_r($val, TRUE); + + $pre = '
' ;
+ 				$pre_close = '
'; } $output .= '' - .$key.'  '.htmlspecialchars($val, ENT_QUOTES, config_item('charset'))."\n"; + .$key.'  '.$pre.htmlspecialchars($val, ENT_QUOTES, config_item('charset')).$pre_close."\n"; } return $output."\n"; -- cgit v1.2.3-24-g4f1b From e5b9f66a92c6352ca725520db4d9390247088a5a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 10 Jul 2017 14:42:14 +0300 Subject: [ci skip] Add changelog entry for #5128 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index b1dc618b2..c6c339f07 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -17,6 +17,7 @@ Bug fixes for 3.1.6 - Fixed a bug (#5164) - :doc:`Loader Library ` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name. - Fixed a bug (#5168) - :doc:`Query Builder ` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached. +- Fixed a bug (#5128) - :doc:`Profiler ` didn't wrap ``$_SESSION`` and configuration arrays in ``
`` tags.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 71a78c2c5ca485eac779622870a909091ec0a439 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 10 Jul 2017 14:51:08 +0300
Subject: [ci skip] Fix #5178 (regression caused by #5168)

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

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 7677f5b40..81603bf31 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1403,7 +1403,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 		// ORDER BY usage is often problematic here (most notably
 		// on Microsoft SQL Server) and ultimately unnecessary
 		// for selecting COUNT(*) ...
-		$qb_orderby       = $this->qb_order_by;
+		$qb_orderby       = $this->qb_orderby;
 		$qb_cache_orderby = $this->qb_cache_orderby;
 		$this->qb_orderby = $this->qb_cache_orderby = NULL;
 
-- 
cgit v1.2.3-24-g4f1b


From 56e452ad93753754e16418f361930ef4d70f06e2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 14 Jul 2017 13:05:48 +0300
Subject: [ci skip] Merge pull request #5183 from
 ytetsuro/add_oci8_driver_write_type

add is_write_type method for merge query
---
 system/database/DB_driver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 3eb51f734..7efb37333 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1044,7 +1044,7 @@ abstract class CI_DB_driver {
 	 */
 	public function is_write_type($sql)
 	{
-		return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s/i', $sql);
+		return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX|MERGE)\s/i', $sql);
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 29740e442a1d78bd65b569c92575cdbf4fc2d614 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 14 Jul 2017 13:08:35 +0300
Subject: [ci skip] Add changelog entry for #5183

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c6c339f07..828c9d30d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -18,6 +18,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5164) - :doc:`Loader Library ` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name.
 -  Fixed a bug (#5168) - :doc:`Query Builder ` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached.
 -  Fixed a bug (#5128) - :doc:`Profiler ` didn't wrap ``$_SESSION`` and configuration arrays in ``
`` tags.
+-  Fixed a bug (#5183) - :doc:`Database Library ` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 6cab78970f212a30ea923835510ffd1fb77a6ad0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 17 Jul 2017 13:14:00 +0300
Subject: [ci skip] escapeshellarg on the image src path passed to NetPBM by
 Image_lib

---
 system/libraries/Image_lib.php      | 2 +-
 user_guide_src/source/changelog.rst | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 88c9e7ede..8786d9d02 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -972,7 +972,7 @@ class CI_Image_lib {
 			$cmd_inner = 'pnmscale -xysize '.$this->width.' '.$this->height;
 		}
 
-		$cmd = $this->library_path.$cmd_in.' '.$this->full_src_path.' | '.$cmd_inner.' | '.$cmd_out.' > '.$this->dest_folder.'netpbm.tmp';
+		$cmd = $this->library_path.$cmd_in.' '.escapeshellarg($this->full_src_path).' | '.$cmd_inner.' | '.$cmd_out.' > '.$this->dest_folder.'netpbm.tmp';
 
 		$retval = 1;
 		// exec() might be disabled
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 828c9d30d..d6984bb7b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -19,6 +19,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5168) - :doc:`Query Builder ` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached.
 -  Fixed a bug (#5128) - :doc:`Profiler ` didn't wrap ``$_SESSION`` and configuration arrays in ``
`` tags.
 -  Fixed a bug (#5183) - :doc:`Database Library ` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
+-  Fixed a bug where :doc:`Image Manipulation Library ` didn't escape image source paths passed to NetPBM as shell arguments.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 954c4aac3211c5e04270c76b9f7ac11466638bef Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 21 Jul 2017 11:51:37 +0300
Subject: [ci skip] Merge pull request #5191 from jim-parry/patch/docs

Fix some mistakes in the user guide
---
 .gitignore                                       | 2 ++
 user_guide_src/source/database/query_builder.rst | 2 +-
 user_guide_src/source/general/urls.rst           | 6 +++---
 user_guide_src/source/libraries/input.rst        | 2 +-
 user_guide_src/source/libraries/loader.rst       | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 96bce5941..269044ea9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ user_guide_src/cilexer/pycilexer.egg-info/*
 *.stTheme.cache
 *.sublime-workspace
 *.sublime-project
+/tests/tests/
+/tests/results/
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 3135f76da..1b79c893a 100644
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -119,7 +119,7 @@ escaping of fields may break them.
 
 ::
 
-	$this->db->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4') AS amount_paid', FALSE);
+	$this->db->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid', FALSE);
 	$query = $this->db->get('mytable');
 
 **$this->db->select_max()**
diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst
index ca44e2f4c..e23554907 100644
--- a/user_guide_src/source/general/urls.rst
+++ b/user_guide_src/source/general/urls.rst
@@ -42,10 +42,10 @@ By default, the **index.php** file will be included in your URLs::
 If your Apache server has *mod_rewrite* enabled, you can easily remove this
 file by using a .htaccess file with some simple rules. Here is an example
 of such a file, using the "negative" method in which everything is redirected
-except the specified items:
-
-::
+except the specified items::
 	
+.. code-block:: console
+
 	RewriteEngine On
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/user_guide_src/source/libraries/input.rst b/user_guide_src/source/libraries/input.rst
index e7107fa06..300f47112 100644
--- a/user_guide_src/source/libraries/input.rst
+++ b/user_guide_src/source/libraries/input.rst
@@ -245,7 +245,7 @@ Class Reference
 		data::
 
 			$this->input->cookie('some_cookie');
-			$this->input->cookie('some_cookie, TRUE); // with XSS filter
+			$this->input->cookie('some_cookie', TRUE); // with XSS filter
 
 		To return an array of multiple cookie values, pass all the required keys
 		as an array.
diff --git a/user_guide_src/source/libraries/loader.rst b/user_guide_src/source/libraries/loader.rst
index 228d5e478..22abb4586 100644
--- a/user_guide_src/source/libraries/loader.rst
+++ b/user_guide_src/source/libraries/loader.rst
@@ -125,7 +125,7 @@ Class Reference
 
 			$config = array (
 				'mailtype' => 'html',
-				'charset'  => 'utf-8,
+				'charset'  => 'utf-8',
 				'priority' => '1'
 			);
 
-- 
cgit v1.2.3-24-g4f1b


From 2f473195dcf6ed83fb31f90dce5b226f3e486ff0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 21 Jul 2017 11:59:51 +0300
Subject: [ci skip] Merge pull request #5188 from
 ryanbriscall/update-sphinx-version-userguide-src
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates version of sphinx to 1.6.3 for easyinstall command in step 2 …
---
 user_guide_src/README.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/README.rst b/user_guide_src/README.rst
index d645adb73..b31db7cf8 100644
--- a/user_guide_src/README.rst
+++ b/user_guide_src/README.rst
@@ -13,17 +13,19 @@ output it to various formats.  Pages are written in human-readable
 Prerequisites
 =============
 
-Sphinx requires Python, which is already installed if you are running OS X.
+Sphinx requires Python 2.7.  If you are on OS X, then you already have Python.
 You can confirm in a Terminal window by executing the ``python`` command
 without any parameters.  It should load up and tell you which version you have
-installed.  If you're not on 2.7+, go ahead and install 2.7.2 from
-http://python.org/download/releases/2.7.2/
+installed.
+
+Note: If you're not on Python 2.7, then you must upgrade. E.g. Install 2.7.2
+from http://python.org/download/releases/2.7.2/
 
 Installation
 ============
 
 1. Install `easy_install `_
-2. ``easy_install "sphinx==1.2.3"``
+2. ``easy_install "sphinx==1.6.3"``
 3. ``easy_install "sphinxcontrib-phpdomain==0.1.3.post1"``
 4. Install the CI Lexer which allows PHP, HTML, CSS, and JavaScript syntax highlighting in code examples (see *cilexer/README*)
 5. ``cd user_guide_src``
-- 
cgit v1.2.3-24-g4f1b


From de3ac40bf40d21a994d170788792557e4e431f37 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 26 Jul 2017 17:46:51 +0300
Subject: [ci skip] Close #5206

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

diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index b37cc2f59..0ad8dd375 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1312,7 +1312,7 @@ class CI_Upload {
 			}
 		}
 
-		// Fall back to the deprecated mime_content_type(), if available (still better than $_FILES[$field]['type'])
+		// Fall back to mime_content_type(), if available (still better than $_FILES[$field]['type'])
 		if (function_exists('mime_content_type'))
 		{
 			$this->file_type = @mime_content_type($file['tmp_name']);
-- 
cgit v1.2.3-24-g4f1b


From 1d9e296934edb4fb026391312fa4311ba9f14b96 Mon Sep 17 00:00:00 2001
From: "Instructor, Computer Systems Technology" 
Date: Wed, 26 Jul 2017 21:42:14 -0700
Subject: Update readme.rst

---
 readme.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.rst b/readme.rst
index f5d737028..b6520080e 100644
--- a/readme.rst
+++ b/readme.rst
@@ -57,7 +57,7 @@ Resources
 -  `Language File Translations `_
 -  `Community Forums `_
 -  `Community Wiki `_
--  `Community IRC `_
+-  `Community Slack Channel `_
 
 Report security issues to our `Security Panel `_
 or via our `page on HackerOne `_, thank you.
-- 
cgit v1.2.3-24-g4f1b


From 85869da7bf1080f26b13f1f1870e192a75a2f677 Mon Sep 17 00:00:00 2001
From: "Instructor, Computer Systems Technology" 
Date: Wed, 26 Jul 2017 21:43:24 -0700
Subject: Update composer.json

Replace IRC reference with Slack
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c40d549c9..30630e224 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
 	"support": {
 		"forum": "http://forum.codeigniter.com/",
 		"wiki": "https://github.com/bcit-ci/CodeIgniter/wiki",
-		"irc": "irc://irc.freenode.net/codeigniter",
+		"slack": "https://codeigniterchat.slack.com",
 		"source": "https://github.com/bcit-ci/CodeIgniter"
 	},
 	"require": {
-- 
cgit v1.2.3-24-g4f1b


From 613b898234debcaea5ec9160e5249358ac7e3dfc Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 25 Aug 2017 13:24:51 +0300
Subject: [ci skip] Fix #5236

---
 system/database/drivers/mssql/mssql_driver.php               | 2 +-
 system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php  | 2 +-
 system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php | 2 +-
 system/database/drivers/sqlsrv/sqlsrv_driver.php             | 2 +-
 user_guide_src/source/changelog.rst                          | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index a2ccd1c80..cb89f3b3f 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -453,7 +453,7 @@ class CI_DB_mssql_driver extends CI_DB {
 			$sql = trim(substr($sql, 0, strrpos($sql, $orderby)));
 
 			// Get the fields to select from our subquery, so that we can avoid CI_rownum appearing in the actual results
-			if (count($this->qb_select) === 0)
+			if (count($this->qb_select) === 0 OR strpos(implode(',', $this->qb_select), '*') !== FALSE)
 			{
 				$select = '*'; // Inevitable
 			}
diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
index 08243232e..e9226c350 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
@@ -284,7 +284,7 @@ class CI_DB_pdo_dblib_driver extends CI_DB_pdo_driver {
 			$sql = trim(substr($sql, 0, strrpos($sql, $orderby)));
 
 			// Get the fields to select from our subquery, so that we can avoid CI_rownum appearing in the actual results
-			if (count($this->qb_select) === 0)
+			if (count($this->qb_select) === 0 OR strpos(implode(',', $this->qb_select), '*') !== FALSE)
 			{
 				$select = '*'; // Inevitable
 			}
diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
index 07c429eec..a9fb4d14a 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
@@ -316,7 +316,7 @@ class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver {
 			$sql = trim(substr($sql, 0, strrpos($sql, $orderby)));
 
 			// Get the fields to select from our subquery, so that we can avoid CI_rownum appearing in the actual results
-			if (count($this->qb_select) === 0)
+			if (count($this->qb_select) === 0 OR strpos(implode(',', $this->qb_select), '*') !== FALSE)
 			{
 				$select = '*'; // Inevitable
 			}
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php
index a43e2539a..4edcc7fb8 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_driver.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php
@@ -478,7 +478,7 @@ class CI_DB_sqlsrv_driver extends CI_DB {
 			$sql = trim(substr($sql, 0, strrpos($sql, $orderby)));
 
 			// Get the fields to select from our subquery, so that we can avoid CI_rownum appearing in the actual results
-			if (count($this->qb_select) === 0)
+			if (count($this->qb_select) === 0 OR strpos(implode(',', $this->qb_select), '*') !== FALSE)
 			{
 				$select = '*'; // Inevitable
 			}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d6984bb7b..9d6620662 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -20,6 +20,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5128) - :doc:`Profiler ` didn't wrap ``$_SESSION`` and configuration arrays in ``
`` tags.
 -  Fixed a bug (#5183) - :doc:`Database Library ` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
 -  Fixed a bug where :doc:`Image Manipulation Library ` didn't escape image source paths passed to NetPBM as shell arguments.
+-  Fixed a bug (#5236) - :doc:`Query Builder ` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"".*`` in the ``SELECT`` clause.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From ce50148cbd3edb6c379b6431a5a55ae2107f9c48 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 31 Aug 2017 16:03:30 +0300
Subject: Merge pull request #5243 from rosseti/fix/pdo-dblib-sqlserver-version

Fix for DBLIB subdriver to get the right version number of SQL Server.
---
 .../database/drivers/pdo/subdrivers/pdo_dblib_driver.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
index e9226c350..b9b86f784 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
@@ -334,4 +334,20 @@ class CI_DB_pdo_dblib_driver extends CI_DB_pdo_driver {
 		return ($this->db_debug) ? $this->display_error('db_unsupported_feature') : FALSE;
 	}
 
+	// --------------------------------------------------------------------
+
+	/**
+	 * Database version number
+	 *
+	 * @return      string
+	 */
+	public function version()
+	{
+		if (isset($this->data_cache['version']))
+		{
+			return $this->data_cache['version'];
+		}
+
+		return $this->data_cache['version'] = $this->conn_id->query("SELECT SERVERPROPERTY('ProductVersion') AS ver")->fetchColumn(0);
+	}
 }
-- 
cgit v1.2.3-24-g4f1b


From c4e7999ded26a1acbefdf7f9eebb69772860bb23 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 31 Aug 2017 16:05:37 +0300
Subject: [ci skip] Add changelog entry for #5243

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 9d6620662..64c98e127 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -21,6 +21,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5183) - :doc:`Database Library ` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
 -  Fixed a bug where :doc:`Image Manipulation Library ` didn't escape image source paths passed to NetPBM as shell arguments.
 -  Fixed a bug (#5236) - :doc:`Query Builder ` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"".*`` in the ``SELECT`` clause.
+-  Fixed a bug (#5243) - :doc:`Database Library ` method ``version()`` didn't work with the 'pdo/dblib' driver.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5e88ea5b2d8c75c896094036ff7c4c3e0254258f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 4 Sep 2017 15:13:37 +0300
Subject: Fix #5246

---
 system/database/DB_driver.php       | 1 +
 user_guide_src/source/changelog.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 7efb37333..0b13a2f82 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -916,6 +916,7 @@ abstract class CI_DB_driver {
 
 		if ($this->_trans_begin())
 		{
+			$this->_trans_status = TRUE;
 			$this->_trans_depth++;
 			return TRUE;
 		}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 64c98e127..372ceeb3b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -22,6 +22,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug where :doc:`Image Manipulation Library ` didn't escape image source paths passed to NetPBM as shell arguments.
 -  Fixed a bug (#5236) - :doc:`Query Builder ` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"".*`` in the ``SELECT`` clause.
 -  Fixed a bug (#5243) - :doc:`Database Library ` method ``version()`` didn't work with the 'pdo/dblib' driver.
+-  Fixed a bug (#5246) - :doc:`Database transactions ` status wasn't reset unless ``trans_complete()`` was called.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 146b131dab454885bf7ae943a93ecab53333520a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 4 Sep 2017 16:24:45 +0300
Subject: Fix Travis-CI failures

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 71ebec3da..a7e5cdaeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: php
+dist: precise
 
 php:
   - 5.3
-- 
cgit v1.2.3-24-g4f1b


From 9385cfed8e61c4568d5ec93c8ee8900f314a5a5a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 13 Sep 2017 13:17:28 +0300
Subject: Fix #5260

---
 system/database/drivers/mysqli/mysqli_result.php  | 58 ++++++++++++++++++++++-
 system/database/drivers/mysqli/mysqli_utility.php |  8 ++--
 user_guide_src/source/changelog.rst               |  2 +
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php
index 929c2b455..0b3d9c2b4 100644
--- a/system/database/drivers/mysqli/mysqli_result.php
+++ b/system/database/drivers/mysqli/mysqli_result.php
@@ -112,9 +112,9 @@ class CI_DB_mysqli_result extends CI_DB_result {
 		{
 			$retval[$i]			= new stdClass();
 			$retval[$i]->name		= $field_data[$i]->name;
-			$retval[$i]->type		= $field_data[$i]->type;
+			$retval[$i]->type		= static::_get_field_type($field_data[$i]->type);
 			$retval[$i]->max_length		= $field_data[$i]->max_length;
-			$retval[$i]->primary_key	= (int) ($field_data[$i]->flags & 2);
+			$retval[$i]->primary_key	= (int) ($field_data[$i]->flags & MYSQLI_PRI_KEY_FLAG);
 			$retval[$i]->default		= $field_data[$i]->def;
 		}
 
@@ -123,6 +123,60 @@ class CI_DB_mysqli_result extends CI_DB_result {
 
 	// --------------------------------------------------------------------
 
+	/**
+	 * Get field type
+	 *
+	 * Extracts field type info from the bitflags returned by
+	 * mysqli_result::fetch_fields()
+	 *
+	 * @used-by	CI_DB_mysqli_result::field_data()
+	 * @param	int	$flags
+	 * @return	string
+	 */
+	private static function _get_field_type($flags)
+	{
+		static $map;
+		isset($map) OR $map = array(
+			MYSQLI_TYPE_DECIMAL     => 'decimal',
+			MYSQLI_TYPE_BIT         => 'bit',
+			MYSQLI_TYPE_TINY        => 'tinyint',
+			MYSQLI_TYPE_SHORT       => 'smallint',
+			MYSQLI_TYPE_INT24       => 'mediumint',
+			MYSQLI_TYPE_LONG        => 'int',
+			MYSQLI_TYPE_LONGLONG    => 'bigint',
+			MYSQLI_TYPE_FLOAT       => 'float',
+			MYSQLI_TYPE_DOUBLE      => 'double',
+			MYSQLI_TYPE_TIMESTAMP   => 'timestamp',
+			MYSQLI_TYPE_DATE        => 'date',
+			MYSQLI_TYPE_TIME        => 'time',
+			MYSQLI_TYPE_DATETIME    => 'datetime',
+			MYSQLI_TYPE_YEAR        => 'year',
+			MYSQLI_TYPE_NEWDATE     => 'date',
+			MYSQLI_TYPE_INTERVAL    => 'interval',
+			MYSQLI_TYPE_ENUM        => 'enum',
+			MYSQLI_TYPE_SET         => 'set',
+			MYSQLI_TYPE_TINY_BLOB   => 'tinyblob',
+			MYSQLI_TYPE_MEDIUM_BLOB => 'mediumblob',
+			MYSQLI_TYPE_BLOB        => 'blob',
+			MYSQLI_TYPE_LONG_BLOB   => 'longblob',
+			MYSQLI_TYPE_STRING      => 'char',
+			MYSQLI_TYPE_VAR_STRING  => 'varchar',
+			MYSQLI_TYPE_GEOMETRY    => 'geometry'
+		);
+
+		foreach ($map as $flag => $name)
+		{
+			if ($flags & $flag)
+			{
+				return $name;
+			}
+		}
+
+		return $flags;
+	}
+
+	// --------------------------------------------------------------------
+
 	/**
 	 * Free the result
 	 *
diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php
index 4a3dad4d1..1699b611f 100644
--- a/system/database/drivers/mysqli/mysqli_utility.php
+++ b/system/database/drivers/mysqli/mysqli_utility.php
@@ -155,9 +155,11 @@ class CI_DB_mysqli_utility extends CI_DB_utility {
 			while ($field = $query->result_id->fetch_field())
 			{
 				// Most versions of MySQL store timestamp as a string
-				$is_int[$i] = in_array(strtolower($field->type),
-							array('tinyint', 'smallint', 'mediumint', 'int', 'bigint'), //, 'timestamp'),
-							TRUE);
+				$is_int[$i] = ($field->type & MYSQLI_TYPE_TINY)
+						OR ($field->type & MYSQLI_TYPE_SHORT)
+						OR ($field->type & MYSQLI_TYPE_INT24)
+						OR ($field->type & MYSQLI_TYPE_LONG)
+						OR ($field->type & MYSQLI_TYPE_LONGLONG);
 
 				// Create a string of field names
 				$field_str .= $this->db->escape_identifiers($field->name).', ';
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 372ceeb3b..055e2d08c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -23,6 +23,8 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5236) - :doc:`Query Builder ` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"".*`` in the ``SELECT`` clause.
 -  Fixed a bug (#5243) - :doc:`Database Library ` method ``version()`` didn't work with the 'pdo/dblib' driver.
 -  Fixed a bug (#5246) - :doc:`Database transactions ` status wasn't reset unless ``trans_complete()`` was called.
+-  Fixed a bug (#5260) - :doc:`Database Utilities ` method ``backup()`` generated incorrect ``INSERT`` statements with the 'mysqli' driver.
+-  Fixed a bug where :doc:`Database Results ` method ``field_data()`` didn't parse field types with the 'mysqli' driver.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From e8eb86764955c9c904b50db7c12a3be73c627406 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 16 Sep 2017 17:27:29 +0300
Subject: [ci skip] Merge pull request #5265 from mehdibo/patch-1

Fixed dbprefix() documentation
---
 user_guide_src/source/database/queries.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index f626f1e83..710ababb0 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -66,7 +66,7 @@ the following::
 If for any reason you would like to change the prefix programatically
 without needing to create a new connection, you can use this method::
 
-	$this->db->set_dbprefix('newprefix');
+	$this->db->set_dbprefix('newprefix_');
 	$this->db->dbprefix('tablename'); // outputs newprefix_tablename
 
 
-- 
cgit v1.2.3-24-g4f1b


From 88c1a597360f5b63371c119b64e913c9238c75b8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 25 Sep 2017 14:39:34 +0300
Subject: [ci skip] Fix potential object injection in apc cache driver;
 deprecate the apc driver

---
 system/libraries/Cache/drivers/Cache_apc.php | 48 +++++++++++++---------------
 user_guide_src/source/changelog.rst          |  5 +++
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php
index f2b61adb1..c873eb640 100644
--- a/system/libraries/Cache/drivers/Cache_apc.php
+++ b/system/libraries/Cache/drivers/Cache_apc.php
@@ -80,14 +80,7 @@ class CI_Cache_apc extends CI_Driver {
 		$success = FALSE;
 		$data = apc_fetch($id, $success);
 
-		if ($success === TRUE)
-		{
-			return is_array($data)
-				? unserialize($data[0])
-				: $data;
-		}
-
-		return FALSE;
+		return ($success === TRUE) ? $data : FALSE;
 	}
 
 	// ------------------------------------------------------------------------
@@ -98,18 +91,12 @@ class CI_Cache_apc extends CI_Driver {
 	 * @param	string	$id	Cache ID
 	 * @param	mixed	$data	Data to store
 	 * @param	int	$ttl	Length of time (in seconds) to cache the data
-	 * @param	bool	$raw	Whether to store the raw value
+	 * @param	bool	$raw	Whether to store the raw value (unused)
 	 * @return	bool	TRUE on success, FALSE on failure
 	 */
 	public function save($id, $data, $ttl = 60, $raw = FALSE)
 	{
-		$ttl = (int) $ttl;
-
-		return apc_store(
-			$id,
-			($raw === TRUE ? $data : array(serialize($data), time(), $ttl)),
-			$ttl
-		);
+		return apc_store($id, $data, (int) $ttl);
 	}
 
 	// ------------------------------------------------------------------------
@@ -188,21 +175,30 @@ class CI_Cache_apc extends CI_Driver {
 	 */
 	public function get_metadata($id)
 	{
-		$success = FALSE;
-		$stored = apc_fetch($id, $success);
-
-		if ($success === FALSE OR count($stored) !== 3)
+		$cache_info = apc_cache_info('user', FALSE);
+		if (empty($cache_info) OR empty($cache_info['cache_list']))
 		{
 			return FALSE;
 		}
 
-		list($data, $time, $ttl) = $stored;
+		foreach ($cache_info['cache_list'] as &$entry)
+		{
+			if ($entry['info'] !== $id)
+			{
+				continue;
+			}
+
+			$success  = FALSE;
+			$metadata = array(
+				'expire' => ($entry['ttl'] ? $entry['mtime'] + $entry['ttl'] : 0),
+				'mtime'  => $entry['ttl'],
+				'data'   => apc_fetch($id, $success)
+			);
+
+			return ($success === TRUE) ? $metadata : FALSE;
+		}
 
-		return array(
-			'expire'	=> $time + $ttl,
-			'mtime'		=> $time,
-			'data'		=> unserialize($data)
-		);
+		return FALSE;
 	}
 
 	// ------------------------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 055e2d08c..dcfe7b481 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,8 +7,13 @@ Version 3.1.6
 
 Release Date: Not Released
 
+-  **Security**
+
+   -  Fixed a potential object injection in :doc:`Cache Library ` 'apc' driver when ``save()`` is used with ``$raw = TRUE`` (thanks to Tomas Bortoli).
+
 -  General Changes
 
+   -  Deprecated :doc:`Cache Library Library ` driver 'apc'.
    -  Updated the :doc:`Session Library ` 'redis', 'memcached' drivers to reduce the potential of a locking race conditions.
 
 
-- 
cgit v1.2.3-24-g4f1b


From dcc029d23128c1e66edb0138adb773d74c808c90 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 25 Sep 2017 14:47:31 +0300
Subject: [ci skip] Add upgrade instructions about the APC deprecation

---
 user_guide_src/source/installation/upgrade_316.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_316.rst b/user_guide_src/source/installation/upgrade_316.rst
index e382c20ab..1d86b5720 100644
--- a/user_guide_src/source/installation/upgrade_316.rst
+++ b/user_guide_src/source/installation/upgrade_316.rst
@@ -12,3 +12,17 @@ Replace all files and directories in your *system/* directory.
 
 .. note:: If you have any custom developed files in these directories,
 	please make copies of them first.
+
+Step 2: Remove usage of the APC Cache driver (deprecation)
+==========================================================
+
+The :doc:`Cache Library <../libraries/caching>` APC driver is now
+deprecated, as the APC extension is effectively dead, as explained in its
+`PHP Manual page `_.
+
+If your application happens to be using it, you can switch to another
+cache driver, as APC support will be removed in a future CodeIgniter
+version.
+
+.. note:: The driver is still available, but you're strongly encouraged
+	to remove its usage sooner rather than later.
-- 
cgit v1.2.3-24-g4f1b


From cf728703b5852591c160cbd9566a0e508dd5759a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 25 Sep 2017 19:37:44 +0300
Subject: [ci skip] Prepare 3.1.6 release

---
 system/core/CodeIgniter.php                      | 2 +-
 user_guide_src/source/changelog.rst              | 2 +-
 user_guide_src/source/conf.py                    | 4 ++--
 user_guide_src/source/installation/downloads.rst | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index f5ffc5ddd..0d03293f6 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.6-dev';
+	const CI_VERSION = '3.1.6';
 
 /*
  * ------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dcfe7b481..e5387cc5a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -5,7 +5,7 @@ Change Log
 Version 3.1.6
 =============
 
-Release Date: Not Released
+Release Date: Sep 25, 2017
 
 -  **Security**
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index f783d67e7..7929f8ae7 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014 - 2017, British Columbia Institute of Technology'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.6-dev'
+version = '3.1.6'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.6-dev'
+release = '3.1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst
index 23c500e12..76335bb67 100644
--- a/user_guide_src/source/installation/downloads.rst
+++ b/user_guide_src/source/installation/downloads.rst
@@ -2,7 +2,7 @@
 Downloading CodeIgniter
 #######################
 
--  `CodeIgniter v3.1.6-dev (Current version) `_
+-  `CodeIgniter v3.1.6 (Current version) `_
 -  `CodeIgniter v3.1.5 `_
 -  `CodeIgniter v3.1.4 `_
 -  `CodeIgniter v3.1.3 `_
-- 
cgit v1.2.3-24-g4f1b


From 4131d42c793c3db50b6184e5084332d5415c91cb Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 25 Sep 2017 19:47:49 +0300
Subject: [ci skip] Mark the start of 3.1.7-dev

---
 system/core/CodeIgniter.php                        |  2 +-
 user_guide_src/source/changelog.rst                |  6 ++++++
 user_guide_src/source/conf.py                      |  4 ++--
 user_guide_src/source/installation/downloads.rst   |  3 ++-
 user_guide_src/source/installation/upgrade_317.rst | 14 ++++++++++++++
 user_guide_src/source/installation/upgrading.rst   |  1 +
 6 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 user_guide_src/source/installation/upgrade_317.rst

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 0d03293f6..a4c7d5553 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.6';
+	const CI_VERSION = '3.1.7-dev';
 
 /*
  * ------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e5387cc5a..b99a709ad 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,6 +2,12 @@
 Change Log
 ##########
 
+Version 3.1.7
+=============
+
+Release Date: Not Released
+
+
 Version 3.1.6
 =============
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 7929f8ae7..e2b1c2972 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014 - 2017, British Columbia Institute of Technology'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.6'
+version = '3.1.7-dev'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.6'
+release = '3.1.7-dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst
index 76335bb67..bb7534d91 100644
--- a/user_guide_src/source/installation/downloads.rst
+++ b/user_guide_src/source/installation/downloads.rst
@@ -2,7 +2,8 @@
 Downloading CodeIgniter
 #######################
 
--  `CodeIgniter v3.1.6 (Current version) `_
+-  `CodeIgniter v3.1.7-dev (Current version) `_
+-  `CodeIgniter v3.1.6 `_
 -  `CodeIgniter v3.1.5 `_
 -  `CodeIgniter v3.1.4 `_
 -  `CodeIgniter v3.1.3 `_
diff --git a/user_guide_src/source/installation/upgrade_317.rst b/user_guide_src/source/installation/upgrade_317.rst
new file mode 100644
index 000000000..93c37b687
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_317.rst
@@ -0,0 +1,14 @@
+#############################
+Upgrading from 3.1.6 to 3.1.7
+#############################
+
+Before performing an update you should take your site offline by
+replacing the index.php file with a static one.
+
+Step 1: Update your CodeIgniter files
+=====================================
+
+Replace all files and directories in your *system/* directory.
+
+.. note:: If you have any custom developed files in these directories,
+	please make copies of them first.
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 991d5cf4c..1cc249869 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
 	:titlesonly:
 
+	Upgrading from 3.1.6 to 3.1.7 
 	Upgrading from 3.1.5 to 3.1.6 
 	Upgrading from 3.1.4 to 3.1.5 
 	Upgrading from 3.1.3 to 3.1.4 
-- 
cgit v1.2.3-24-g4f1b


From a9194650e6ae387be29aacfdf4b1b27a5c60ca34 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 27 Sep 2017 18:57:46 +0300
Subject: Fix #5276

---
 system/database/drivers/mysqli/mysqli_result.php  | 14 +++-----------
 system/database/drivers/mysqli/mysqli_utility.php |  6 +-----
 user_guide_src/source/changelog.rst               |  5 +++++
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php
index 0b3d9c2b4..bd465c405 100644
--- a/system/database/drivers/mysqli/mysqli_result.php
+++ b/system/database/drivers/mysqli/mysqli_result.php
@@ -130,10 +130,10 @@ class CI_DB_mysqli_result extends CI_DB_result {
 	 * mysqli_result::fetch_fields()
 	 *
 	 * @used-by	CI_DB_mysqli_result::field_data()
-	 * @param	int	$flags
+	 * @param	int	$type
 	 * @return	string
 	 */
-	private static function _get_field_type($flags)
+	private static function _get_field_type($type)
 	{
 		static $map;
 		isset($map) OR $map = array(
@@ -164,15 +164,7 @@ class CI_DB_mysqli_result extends CI_DB_result {
 			MYSQLI_TYPE_GEOMETRY    => 'geometry'
 		);
 
-		foreach ($map as $flag => $name)
-		{
-			if ($flags & $flag)
-			{
-				return $name;
-			}
-		}
-
-		return $flags;
+		return isset($map[$type]) ? $map[$type] : $type;
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php
index 1699b611f..82cf5cebf 100644
--- a/system/database/drivers/mysqli/mysqli_utility.php
+++ b/system/database/drivers/mysqli/mysqli_utility.php
@@ -155,11 +155,7 @@ class CI_DB_mysqli_utility extends CI_DB_utility {
 			while ($field = $query->result_id->fetch_field())
 			{
 				// Most versions of MySQL store timestamp as a string
-				$is_int[$i] = ($field->type & MYSQLI_TYPE_TINY)
-						OR ($field->type & MYSQLI_TYPE_SHORT)
-						OR ($field->type & MYSQLI_TYPE_INT24)
-						OR ($field->type & MYSQLI_TYPE_LONG)
-						OR ($field->type & MYSQLI_TYPE_LONGLONG);
+				$is_int[$i] = in_array($field->type, array(MYSQLI_TYPE_TINY, MYSQLI_TYPE_SHORT, MYSQLI_TYPE_INT24, MYSQLI_TYPE_LONG), TRUE);
 
 				// Create a string of field names
 				$field_str .= $this->db->escape_identifiers($field->name).', ';
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b99a709ad..2dd77e389 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,11 @@ Version 3.1.7
 
 Release Date: Not Released
 
+Bug fixes for 3.1.7
+-------------------
+
+-  Fixed a regression (#5276) - :doc:`Database Utilities ` method ``backup()`` generated incorrect ``INSERT`` statements with the 'mysqli' driver.
+-  Fixed a regression where :doc:`Database Results ` method ``field_data()`` returned incorrect type names.
 
 Version 3.1.6
 =============
-- 
cgit v1.2.3-24-g4f1b


From d13babc46bf0e1de0f82cfdef859b949501f095b Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 29 Sep 2017 12:00:24 +0300
Subject: Merge pull request #5278 from Uekawa/auto_link

Fix auto_link trailing slash
---
 system/helpers/url_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 system/helpers/url_helper.php

diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
old mode 100644
new mode 100755
index 84023affd..f6fb7d9eb
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -393,7 +393,7 @@ if ( ! function_exists('auto_link'))
 	function auto_link($str, $type = 'both', $popup = FALSE)
 	{
 		// Find and replace any URLs.
-		if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[^\s()<>;]+\w#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER))
+		if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[^\s()<>;]+\w/?#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER))
 		{
 			// Set our target HTML if using popup links.
 			$target = ($popup) ? ' target="_blank"' : '';
-- 
cgit v1.2.3-24-g4f1b


From 00b050a5b4bb8a06e792cf297c4bcd3b9ede6d7e Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 29 Sep 2017 12:02:06 +0300
Subject: [ci skip] Revert file permission change from PR #5278

---
 system/helpers/url_helper.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 system/helpers/url_helper.php

diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
old mode 100755
new mode 100644
-- 
cgit v1.2.3-24-g4f1b


From 6b08edf5d6ab24310460147a1c9785b80eca6304 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 29 Sep 2017 12:04:38 +0300
Subject: Add testcase and changelog entry for #5278

---
 tests/codeigniter/helpers/url_helper_test.php | 5 +++--
 user_guide_src/source/changelog.rst           | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/codeigniter/helpers/url_helper_test.php b/tests/codeigniter/helpers/url_helper_test.php
index 24823a634..5fbc364bf 100644
--- a/tests/codeigniter/helpers/url_helper_test.php
+++ b/tests/codeigniter/helpers/url_helper_test.php
@@ -53,7 +53,8 @@ class Url_helper_test extends CI_TestCase {
 			'
www.google.com' => '
www.google.com',
 			'Download CodeIgniter at www.codeigniter.com. Period test.' => 'Download CodeIgniter at www.codeigniter.com. Period test.',
 			'Download CodeIgniter at www.codeigniter.com, comma test' => 'Download CodeIgniter at www.codeigniter.com, comma test',
-			'This one: ://codeigniter.com must not break this one: http://codeigniter.com' => 'This one: ://codeigniter.com must not break this one: http://codeigniter.com'
+			'This one: ://codeigniter.com must not break this one: http://codeigniter.com' => 'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
+			'Trailing slash: https://codeigniter.com/ fubar' => 'Trailing slash: https://codeigniter.com/ fubar'
 		);
 
 		foreach ($strings as $in => $out)
@@ -76,4 +77,4 @@ class Url_helper_test extends CI_TestCase {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2dd77e389..1c71b09ef 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -12,6 +12,7 @@ Bug fixes for 3.1.7
 
 -  Fixed a regression (#5276) - :doc:`Database Utilities ` method ``backup()`` generated incorrect ``INSERT`` statements with the 'mysqli' driver.
 -  Fixed a regression where :doc:`Database Results ` method ``field_data()`` returned incorrect type names.
+-  Fixed a bug (#5278) - :doc:`URL Helper ` function :php:func:`auto_link()` didn't detect trailing slashes in URLs.
 
 Version 3.1.6
 =============
-- 
cgit v1.2.3-24-g4f1b


From c495515f115685fbcb4180f4305ec2406144ca83 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 2 Oct 2017 10:50:21 +0300
Subject: [ci skip] Merge pull request #5281 from pawelkg/develop

Adding some letters translated to Y in foregin_chars.php
---
 application/config/foreign_chars.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
index ac406e3d4..995f48304 100644
--- a/application/config/foreign_chars.php
+++ b/application/config/foreign_chars.php
@@ -59,8 +59,8 @@ $foreign_characters = array(
 	'/Þ|þ/' => 'th',
 	'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U',
 	'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u',
-	'/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/' => 'Y',
-	'/ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/' => 'y',
+	'/Ƴ|Ɏ|Ỵ|Ẏ|Ӳ|Ӯ|Ў|Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/' => 'Y',
+	'/ẙ|ʏ|ƴ|ɏ|ỵ|ẏ|ӳ|ӯ|ў|ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/' => 'y',
 	'/В/' => 'V',
 	'/в/' => 'v',
 	'/Ŵ/' => 'W',
-- 
cgit v1.2.3-24-g4f1b


From cf3924ec3f19fb6a3f4782cfe55e0c6314bcf94d Mon Sep 17 00:00:00 2001
From: pgee70 
Date: Tue, 3 Oct 2017 10:09:04 +1100
Subject: Update DB_query_builder.php

recent changes broke query ordering giving a warning in line 1238 = '$this->qb_cache_orderby = array_merge($this->qb_cache_orderby, $qb_orderby);'
this was because on subsequent re-queries, the qb_cache_orderby was set to NULL not Array() as it is should be (and is instantiated originally .
---
 system/database/DB_query_builder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 81603bf31..72bd4e721 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1405,7 +1405,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 		// for selecting COUNT(*) ...
 		$qb_orderby       = $this->qb_orderby;
 		$qb_cache_orderby = $this->qb_cache_orderby;
-		$this->qb_orderby = $this->qb_cache_orderby = NULL;
+		$this->qb_orderby = $this->qb_cache_orderby = array();
 
 		$result = ($this->qb_distinct === TRUE OR ! empty($this->qb_groupby) OR ! empty($this->qb_cache_groupby) OR $this->qb_limit OR $this->qb_offset)
 			? $this->query($this->_count_string.$this->protect_identifiers('numrows')."\nFROM (\n".$this->_compile_select()."\n) CI_count_all_results")
-- 
cgit v1.2.3-24-g4f1b


From 9bba3aeca2b45728009e573e4d45a6ef760d5c33 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 3 Oct 2017 14:21:36 +0300
Subject: [ci skip] Add changelog entry for #5282

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1c71b09ef..c762df744 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -13,6 +13,7 @@ Bug fixes for 3.1.7
 -  Fixed a regression (#5276) - :doc:`Database Utilities ` method ``backup()`` generated incorrect ``INSERT`` statements with the 'mysqli' driver.
 -  Fixed a regression where :doc:`Database Results ` method ``field_data()`` returned incorrect type names.
 -  Fixed a bug (#5278) - :doc:`URL Helper ` function :php:func:`auto_link()` didn't detect trailing slashes in URLs.
+-  Fixed a regression (#5282) - :doc:`Query Builder ` method ``count_all_results()`` breaks ``ORDER BY`` clauses for subsequent queries.
 
 Version 3.1.6
 =============
-- 
cgit v1.2.3-24-g4f1b


From 4c679b5e7c2363c2c815e310e31e0f982dba3863 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 4 Oct 2017 12:12:26 +0300
Subject: [ci skip] Fix a typo in pagination docs

---
 user_guide_src/source/libraries/pagination.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 99b5a80a2..fbc75ea56 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -128,7 +128,7 @@ the offset segment.
 
 **$config['suffix'] = '';**
 
-A custom suffix added to the path. The sufix value will be right after
+A custom suffix added to the path. The suffix value will be right after
 the offset segment.
 
 **$config['use_global_url_suffix'] = FALSE;**
@@ -311,4 +311,4 @@ Class Reference
 		:returns:	HTML-formatted pagination
 		:rtype:	string
 
-		Returns a "pagination" bar, containing the generated links or an empty string if there's just a single page.
\ No newline at end of file
+		Returns a "pagination" bar, containing the generated links or an empty string if there's just a single page.
-- 
cgit v1.2.3-24-g4f1b


From 23aa166a7bef428cbbb06b3f6f7a3fa9f0e78524 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 9 Oct 2017 10:57:57 +0300
Subject: [ci skip] Merge pull request #5292 from ajdunn2/develop

Small spelling fix
---
 application/config/database.php                  | 2 +-
 user_guide_src/source/database/configuration.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/config/database.php b/application/config/database.php
index bf9857fff..d22321e2a 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -47,7 +47,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 |				'ssl_key'    - Path to the private key file
 |				'ssl_cert'   - Path to the public key certificate file
 |				'ssl_ca'     - Path to the certificate authority file
-|				'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
+|				'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format
 |				'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
 |				'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
 |
diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index e231a7d6a..a9bf7dcb6 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -186,7 +186,7 @@ Explanation of Values:
 			    - 'ssl_key'    - Path to the private key file
 			    - 'ssl_cert'   - Path to the public key certificate file
 			    - 'ssl_ca'     - Path to the certificate authority file
-			    - 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
+			    - 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format
 			    - 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
 			    - 'ssl_verify' - TRUE/FALSE; Whether to verify the server certificate or not ('mysqli' only)
 
-- 
cgit v1.2.3-24-g4f1b


From 2e0247aac56f7076705211fb8845101697e62c05 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 9 Oct 2017 11:00:03 +0300
Subject: [ci skip] Merge pull request #5295 from
 mamat-rahmat/fix-docs-code-block

Fix broken .htaccess example code-block
---
 user_guide_src/source/general/urls.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst
index e23554907..b8a1b9f5b 100644
--- a/user_guide_src/source/general/urls.rst
+++ b/user_guide_src/source/general/urls.rst
@@ -42,9 +42,9 @@ By default, the **index.php** file will be included in your URLs::
 If your Apache server has *mod_rewrite* enabled, you can easily remove this
 file by using a .htaccess file with some simple rules. Here is an example
 of such a file, using the "negative" method in which everything is redirected
-except the specified items::
+except the specified items:
 	
-.. code-block:: console
+.. code-block:: apache
 
 	RewriteEngine On
 	RewriteCond %{REQUEST_FILENAME} !-f
-- 
cgit v1.2.3-24-g4f1b


From c54fd9116d49714390aa109cead0545c80ebb057 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 12 Oct 2017 12:56:09 +0300
Subject: Merge pull request #5289 from zploskey/cleanup_form_validation_tests

Clean up form validation tests
---
 .../codeigniter/libraries/Form_validation_test.php | 40 ++++++++++++----------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/tests/codeigniter/libraries/Form_validation_test.php b/tests/codeigniter/libraries/Form_validation_test.php
index c9c404b43..fa9e86c97 100644
--- a/tests/codeigniter/libraries/Form_validation_test.php
+++ b/tests/codeigniter/libraries/Form_validation_test.php
@@ -305,9 +305,6 @@ class Form_validation_test extends CI_TestCase {
 
 	public function test_set_data()
 	{
-		// Reset test environment
-		$_POST = array();
-		$this->form_validation->reset_validation();
 		$data = array('field' => 'some_data');
 		$this->form_validation->set_data($data);
 		$this->form_validation->set_rules('field', 'label', 'required');
@@ -326,9 +323,6 @@ class Form_validation_test extends CI_TestCase {
 
 	public function test_set_message()
 	{
-		// Reset test environment
-		$_POST = array();
-		$this->form_validation->reset_validation();
 		$err_message = 'What a terrible error!';
 		$rules = array(
 			array(
@@ -356,7 +350,6 @@ class Form_validation_test extends CI_TestCase {
 
 	public function test_set_error_delimiters()
 	{
-		$this->form_validation->reset_validation();
 		$prefix = '
';
 		$suffix = '
';
 		$this->form_validation->set_error_delimiters($prefix, $suffix);
@@ -367,11 +360,12 @@ class Form_validation_test extends CI_TestCase {
 
 		$this->assertTrue(strrpos($error_msg, $prefix) === 0);
 		$this->assertTrue(strrpos($error_msg, $suffix, -strlen($suffix)) === (strlen($error_msg) - strlen($suffix)));
+
+		$_POST = array();
 	}
 
 	public function test_error_array()
 	{
-		$this->form_validation->reset_validation();
 		$error_message = 'What a terrible error!';
 		$this->form_validation->set_message('required', $error_message);
 		$this->form_validation->set_rules('foo', 'label', 'required');
@@ -379,11 +373,12 @@ class Form_validation_test extends CI_TestCase {
 		$this->form_validation->run();
 		$error_array = $this->form_validation->error_array();
 		$this->assertEquals($error_message, $error_array['foo']);
+
+		$_POST = array();
 	}
 
 	public function test_error_string()
 	{
-		$this->form_validation->reset_validation();
 		$error_message = 'What a terrible error!';
 		$prefix_default = '';
 		$suffix_default = '';
@@ -405,6 +400,8 @@ class Form_validation_test extends CI_TestCase {
 		$_POST = array('foo' => 'bar');
 		$this->form_validation->run();
 		$this->assertEquals('', $this->form_validation->error_string());
+
+		$_POST = array();
 	}
 
 	public function test_run()
@@ -433,11 +430,12 @@ class Form_validation_test extends CI_TestCase {
 
 		$form_validation = new CI_Form_validation($config);
 		$this->assertFalse($form_validation->run('fail'));
+
+		$_POST = array();
 	}
 
 	public function test_has_rule()
 	{
-		$this->form_validation->reset_validation();
 		$this->form_validation->set_rules('foo', 'label', 'required');
 
 		$this->assertTrue($this->form_validation->has_rule('foo'));
@@ -446,7 +444,6 @@ class Form_validation_test extends CI_TestCase {
 
 	public function test_set_value()
 	{
-		$this->form_validation->reset_validation();
 		$default = 'default';
 		$this->form_validation->set_rules('foo', 'label', 'required');
 		$this->form_validation->set_rules('bar[]', 'label', 'required');
@@ -458,13 +455,13 @@ class Form_validation_test extends CI_TestCase {
 		$this->assertEquals('foo', $this->form_validation->set_value('foo', $default));
 		$this->assertEquals('bar1', $this->form_validation->set_value('bar[]', $default));
 		$this->assertEquals('bar2', $this->form_validation->set_value('bar[]', $default));
+
+		$_POST = array();
 	}
 
 	public function test_set_select()
 	{
 		// Test 1: No options selected
-		$this->form_validation->reset_validation();
-		$_POST = array();
 		$this->form_validation->run();
 
 		$this->assertEquals('', $this->form_validation->set_select('select', 'foo'));
@@ -493,13 +490,13 @@ class Form_validation_test extends CI_TestCase {
 		$this->assertEquals(' selected="selected"', $this->form_validation->set_select('select[]', 'bar', TRUE));
 		$this->assertEquals('', $this->form_validation->set_select('select[]', 'foobar'));
 		$this->assertEquals('', $this->form_validation->set_select('select[]', 'foobar', TRUE));
+
+		$_POST = array();
 	}
 
 	public function test_set_radio()
 	{
 		// Test 1: No options selected
-		$this->form_validation->reset_validation();
-		$_POST = array();
 		$this->form_validation->run();
 
 		$this->assertEquals('', $this->form_validation->set_radio('select', 'foo'));
@@ -529,13 +526,13 @@ class Form_validation_test extends CI_TestCase {
 		$this->assertEquals(' checked="checked"', $this->form_validation->set_radio('select[]', 'bar', TRUE));
 		$this->assertEquals('', $this->form_validation->set_radio('select[]', 'foobar'));
 		$this->assertEquals('', $this->form_validation->set_radio('select[]', 'foobar', TRUE));
+
+		$_POST = array();
 	}
 
 	public function test_set_checkbox()
 	{
 		// Test 1: No options selected
-		$this->form_validation->reset_validation();
-		$_POST = array();
 		$this->form_validation->run();
 
 		$this->assertEquals('', $this->form_validation->set_checkbox('select', 'foo'));
@@ -564,6 +561,8 @@ class Form_validation_test extends CI_TestCase {
 		$this->assertEquals(' checked="checked"', $this->form_validation->set_checkbox('select[]', 'bar', TRUE));
 		$this->assertEquals('', $this->form_validation->set_checkbox('select[]', 'foobar'));
 		$this->assertEquals('', $this->form_validation->set_checkbox('select[]', 'foobar', TRUE));
+
+		$_POST = array();
 	}
 
 	public function test_regex_match()
@@ -612,13 +611,16 @@ class Form_validation_test extends CI_TestCase {
 	{
 		$this->form_validation->reset_validation();
 		$_POST = array();
-
 		$this->form_validation->set_rules($rules);
+
 		foreach ($values as $field => $value)
 		{
 			$_POST[$field] = $value;
 		}
 
-		return $this->form_validation->run();
+		$valid = $this->form_validation->run();
+		$_POST = array();
+
+		return $valid;
 	}
 }
-- 
cgit v1.2.3-24-g4f1b


From fa2a0c58eb0f6421e3819df8a8873b5a5e4ebb58 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 13 Oct 2017 17:04:35 +0300
Subject: Fix #5297

---
 system/database/DB_driver.php       | 12 ++++++++----
 user_guide_src/source/changelog.rst |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 0b13a2f82..c18701db3 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1926,15 +1926,19 @@ abstract class CI_DB_driver {
 					$i++;
 				}
 
+				// dbprefix may've already been applied, with or without the identifier escaped
+				$ec = '(?'.preg_quote(is_array($this->_escape_char) ? $this->_escape_char[0] : $this->_escape_char).')?';
+				isset($ec[0]) && $ec .= '?'; // Just in case someone has disabled escaping by forcing an empty escape character
+
 				// Verify table prefix and replace if necessary
-				if ($this->swap_pre !== '' && strpos($parts[$i], $this->swap_pre) === 0)
+				if ($this->swap_pre !== '' && preg_match('#^'.$ec.preg_quote($this->swap_pre).'#', $parts[$i]))
 				{
-					$parts[$i] = preg_replace('/^'.$this->swap_pre.'(\S+?)/', $this->dbprefix.'\\1', $parts[$i]);
+					$parts[$i] = preg_replace('#^'.$ec.preg_quote($this->swap_pre).'(\S+?)#', '\\1'.$this->dbprefix.'\\2', $parts[$i]);
 				}
 				// We only add the table prefix if it does not already exist
-				elseif (strpos($parts[$i], $this->dbprefix) !== 0)
+				else
 				{
-					$parts[$i] = $this->dbprefix.$parts[$i];
+					preg_match('#^'.$ec.preg_quote($this->dbprefix).'#', $parts[$i]) OR $parts[$i] = $this->dbprefix.$parts[$i];
 				}
 
 				// Put the parts back together
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c762df744..d222e17fb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -14,6 +14,7 @@ Bug fixes for 3.1.7
 -  Fixed a regression where :doc:`Database Results ` method ``field_data()`` returned incorrect type names.
 -  Fixed a bug (#5278) - :doc:`URL Helper ` function :php:func:`auto_link()` didn't detect trailing slashes in URLs.
 -  Fixed a regression (#5282) - :doc:`Query Builder ` method ``count_all_results()`` breaks ``ORDER BY`` clauses for subsequent queries.
+-  Fixed a bug (#5279) - :doc:`Query Builder ` didn't account for already escaped identifiers while applying database name prefixes.
 
 Version 3.1.6
 =============
-- 
cgit v1.2.3-24-g4f1b


From d282d07dfba94b5395d1dd989bdb958c972bb7cf Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 16 Oct 2017 11:05:58 +0300
Subject: [ci skip] Use INTL_IDNA_VARIANT_UCS46 to convert non-ASCII domain
 names in emails

Close #5300
---
 system/libraries/Email.php           | 6 ++++--
 system/libraries/Form_validation.php | 3 ++-
 user_guide_src/source/changelog.rst  | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 0e9cf0574..48726b769 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1036,7 +1036,8 @@ class CI_Email {
 	{
 		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
 		{
-			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos));
+			$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
+			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), $variant);
 		}
 
 		return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
@@ -1853,7 +1854,8 @@ class CI_Email {
 	{
 		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
 		{
-			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos));
+			$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
+			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), $variant);
 		}
 
 		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 71d0e64b1..1619ec9a9 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1231,7 +1231,8 @@ class CI_Form_validation {
 	{
 		if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches))
 		{
-			$str = $matches[1].'@'.idn_to_ascii($matches[2]);
+			$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
+			$str = $matches[1].'@'.idn_to_ascii($matches[2], $variant);
 		}
 
 		return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d222e17fb..647fe4817 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,11 @@ Version 3.1.7
 
 Release Date: Not Released
 
+-  General Changes
+
+   -  Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names.
+   -  Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names.
+
 Bug fixes for 3.1.7
 -------------------
 
-- 
cgit v1.2.3-24-g4f1b


From 211d23d31bd33d857377bdb13abdc104772164ff Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 25 Oct 2017 18:03:05 +0300
Subject: [ci skip] Merge pull request #5311 from
 gonzalo-massa/gonzalo-massa-patch-1

Download links for versions 2.2.4 to 2.2.6 added to docs
---
 user_guide_src/source/installation/downloads.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst
index bb7534d91..34e654078 100644
--- a/user_guide_src/source/installation/downloads.rst
+++ b/user_guide_src/source/installation/downloads.rst
@@ -17,6 +17,9 @@ Downloading CodeIgniter
 -  `CodeIgniter v3.0.2 `_
 -  `CodeIgniter v3.0.1 `_
 -  `CodeIgniter v3.0.0 `_
+-  `CodeIgniter v2.2.6 `_
+-  `CodeIgniter v2.2.5 `_
+-  `CodeIgniter v2.2.4 `_
 -  `CodeIgniter v2.2.3 `_
 -  `CodeIgniter v2.2.2 `_
 -  `CodeIgniter v2.2.1 `_
-- 
cgit v1.2.3-24-g4f1b


From 6cfc6a9c2a03207fdade86660e73aa4607b98f56 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 3 Nov 2017 13:38:13 +0200
Subject: [ci skip] Merge pull request #5321 from PrestigeT/documentation

Fixed docblock on model function. Changed @param model from string to mixed
---
 system/core/Loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 085c5b51d..fe2d43717 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -226,7 +226,7 @@ class CI_Loader {
 	 *
 	 * Loads and instantiates models.
 	 *
-	 * @param	string	$model		Model name
+	 * @param	mixed	$model		Model name
 	 * @param	string	$name		An optional object name to assign to
 	 * @param	bool	$db_conn	An optional database connection configuration to initialize
 	 * @return	object
-- 
cgit v1.2.3-24-g4f1b


From 35278338a21e6303a32fc3e3039b32d28e0d3fc5 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 6 Nov 2017 13:04:47 +0200
Subject: [ci skip] Merge pull request #5326 from vinodselvin/patch-1

Bug in documentation
---
 contributing.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contributing.md b/contributing.md
index 2037e0424..8edb510cf 100644
--- a/contributing.md
+++ b/contributing.md
@@ -1,7 +1,7 @@
 # Contributing to CodeIgniter
 
 
-CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. These contributions are made in the form of Issues or [Pull Requests](http://help.github.com/send-pull-requests/) on the [CodeIgniter repository](https://github.com/bcit-ci/CodeIgniter>) on GitHub.
+CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. These contributions are made in the form of Issues or [Pull Requests](http://help.github.com/send-pull-requests/) on the [CodeIgniter repository](https://github.com/bcit-ci/CodeIgniter) on GitHub.
 
 Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please check a few things first:
 
@@ -92,4 +92,4 @@ If you are using command-line you can do the following:
 2. `git pull codeigniter develop`
 3. `git push origin develop`
 
-Now your fork is up to date. This should be done regularly, or before you send a pull request at least.
\ No newline at end of file
+Now your fork is up to date. This should be done regularly, or before you send a pull request at least.
-- 
cgit v1.2.3-24-g4f1b


From 44aa1ab0655283b67d6fdcb081803f25453dbc73 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 7 Nov 2017 15:42:53 +0200
Subject: [ci skip] Deprecate extra parameters of the CAPTCHA helper

---
 system/helpers/captcha_helper.php                  |  8 ++++----
 user_guide_src/source/changelog.rst                |  1 +
 user_guide_src/source/helpers/captcha_helper.rst   | 12 ++++++++----
 user_guide_src/source/installation/upgrade_317.rst | 13 +++++++++++++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index 8f44806cc..b1a7eedd0 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -54,10 +54,10 @@ if ( ! function_exists('create_captcha'))
 	/**
 	 * Create CAPTCHA
 	 *
-	 * @param	array	$data		data for the CAPTCHA
-	 * @param	string	$img_path	path to create the image in
-	 * @param	string	$img_url	URL to the CAPTCHA image folder
-	 * @param	string	$font_path	server path to font
+	 * @param	array	$data		Data for the CAPTCHA
+	 * @param	string	$img_path	Path to create the image in (deprecated)
+	 * @param	string	$img_url	URL to the CAPTCHA image folder (deprecated)
+	 * @param	string	$font_path	Server path to font (deprecated)
 	 * @return	string
 	 */
 	function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '')
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 647fe4817..1793108d8 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -11,6 +11,7 @@ Release Date: Not Released
 
    -  Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names.
    -  Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names.
+   -  Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``.
 
 Bug fixes for 3.1.7
 -------------------
diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst
index 986c1d3e1..be1b20aaf 100644
--- a/user_guide_src/source/helpers/captcha_helper.rst
+++ b/user_guide_src/source/helpers/captcha_helper.rst
@@ -135,9 +135,9 @@ The following functions are available:
 .. php:function:: create_captcha([$data = ''[, $img_path = ''[, $img_url = ''[, $font_path = '']]]])
 
 	:param	array	$data: Array of data for the CAPTCHA
-	:param	string	$img_path: Path to create the image in
-	:param	string	$img_url: URL to the CAPTCHA image folder
-	:param	string	$font_path: Server path to font
+	:param	string	$img_path: Path to create the image in (DEPRECATED)
+	:param	string	$img_url: URL to the CAPTCHA image folder (DEPRECATED)
+	:param	string	$font_path: Server path to font (DEPRECATED)
 	:returns:	array('word' => $word, 'time' => $now, 'image' => $img)
 	:rtype:	array
 
@@ -161,4 +161,8 @@ The following functions are available:
 	file extension. It will be a number like this: 1139612155.3422
 
 	The **word** is the word that appears in the captcha image, which if not
-	supplied to the function, will be a random string.
\ No newline at end of file
+	supplied to the function, will be a random string.
+
+	.. note:: Usage of the ``$img_path``, ``$img_url`` and ``$font_path``
+		parameters is DEPRECATED. Provide them in the ``$data`` array
+		instead.
diff --git a/user_guide_src/source/installation/upgrade_317.rst b/user_guide_src/source/installation/upgrade_317.rst
index 93c37b687..dc1ee1868 100644
--- a/user_guide_src/source/installation/upgrade_317.rst
+++ b/user_guide_src/source/installation/upgrade_317.rst
@@ -12,3 +12,16 @@ Replace all files and directories in your *system/* directory.
 
 .. note:: If you have any custom developed files in these directories,
 	please make copies of them first.
+
+Step 2: Remove usage of CAPTCHA helper extra parameters (deprecation)
+=====================================================================
+
+The :doc:`CAPTCHA Helper <../helpers/captcha_helper>` function
+:php:func:`create_captcha()` allows passing of its ``img_path``, ``img_url``
+and ``font_path`` options as the 2nd, 3rd and 4th parameters respectively.
+
+This kind of usage is now deprecated and you should just pass the options
+in question as part of the first parameter array.
+
+.. note:: The functionality in question is still available, but you're
+	strongly encouraged to remove its usage sooner rather than later.
-- 
cgit v1.2.3-24-g4f1b


From 4541bf930e715917622dc2d225bf5517f99db35a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 9 Nov 2017 17:27:59 +0200
Subject: [ci skip] Fix patch for #5300

---
 system/libraries/Email.php           | 4 ++--
 system/libraries/Form_validation.php | 2 +-
 user_guide_src/source/changelog.rst  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 48726b769..3b1da8de0 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1037,7 +1037,7 @@ class CI_Email {
 		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
 		{
 			$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
-			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), $variant);
+			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, $variant);
 		}
 
 		return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
@@ -1855,7 +1855,7 @@ class CI_Email {
 		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
 		{
 			$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
-			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), $variant);
+			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, $variant);
 		}
 
 		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 1619ec9a9..cd1d4a759 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1232,7 +1232,7 @@ class CI_Form_validation {
 		if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches))
 		{
 			$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
-			$str = $matches[1].'@'.idn_to_ascii($matches[2], $variant);
+			$str = $matches[1].'@'.idn_to_ascii($matches[2], 0, $variant);
 		}
 
 		return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1793108d8..eb879c5a8 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -9,8 +9,8 @@ Release Date: Not Released
 
 -  General Changes
 
-   -  Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names.
-   -  Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UCS46`` for non-ASCII domain names.
+   -  Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names.
+   -  Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names.
    -  Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``.
 
 Bug fixes for 3.1.7
-- 
cgit v1.2.3-24-g4f1b


From df17a8940679bd7a087806052ae8e550fc1e249f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 9 Nov 2017 16:40:47 +0200
Subject: Attempt PHP 7.2 tests on Travis

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a7e5cdaeb..c235b3881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - hhvm
   
 env:
@@ -31,6 +32,7 @@ script: php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7
 
 matrix:
   allow_failures:
+    - php: 7.2
     - php: hhvm
   exclude:
     - php: hhvm
-- 
cgit v1.2.3-24-g4f1b


From 4d1a9bd57c149b47183539677a64988916002cdf Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 9 Nov 2017 17:30:41 +0200
Subject: Don't try to run 'DB=mysql' tests on PHP 7.2

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c235b3881..044988998 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,8 @@ matrix:
       env: DB=mysql
     - php: 7.1
       env: DB=mysql
+    - php: 7.2
+      env: DB=mysql
 
 branches:
   only:
-- 
cgit v1.2.3-24-g4f1b


From 37134fd545ba39804b3f9fb6f51547d422d1e261 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 9 Nov 2017 18:15:45 +0200
Subject: Move PHP 7.2 into the main testing matrix

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 044988998..8f7838bdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,6 @@ script: php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7
 
 matrix:
   allow_failures:
-    - php: 7.2
     - php: hhvm
   exclude:
     - php: hhvm
-- 
cgit v1.2.3-24-g4f1b


From 4fd2d49461cd871a99a63c51563b8aee3d023abd Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 9 Nov 2017 20:38:33 +0200
Subject: More on #5003

---
 system/libraries/Email.php           | 18 ++++++++++++------
 system/libraries/Form_validation.php |  6 ++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 3b1da8de0..948cdb5c2 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1034,10 +1034,13 @@ class CI_Email {
 	 */
 	public function valid_email($email)
 	{
-		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
+		if (function_exists('idn_to_ascii') && strpos($email, '@'))
 		{
-			$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
-			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, $variant);
+			list($account, $domain) = explode('@', $email, 2);
+			$domain = is_php('5.4')
+				? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
+				: idn_to_ascii($domain);
+			$email = $account.'@'.$domain;
 		}
 
 		return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
@@ -1852,10 +1855,13 @@ class CI_Email {
 	 */
 	protected function _validate_email_for_shell(&$email)
 	{
-		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
+		if (function_exists('idn_to_ascii') && strpos($email, '@'))
 		{
-			$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
-			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, $variant);
+			list($account, $domain) = explode('@', $email, 2);
+			$domain = is_php('5.4')
+				? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46)
+				: idn_to_ascii($domain);
+			$email = $account.'@'.$domain;
 		}
 
 		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index cd1d4a759..73fb2dab9 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1231,8 +1231,10 @@ class CI_Form_validation {
 	{
 		if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches))
 		{
-			$variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
-			$str = $matches[1].'@'.idn_to_ascii($matches[2], 0, $variant);
+			$domain = is_php('5.4')
+				? idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46)
+				: idn_to_ascii($matches[2]);
+			$str = $matches[1].'@'.$domain;
 		}
 
 		return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
-- 
cgit v1.2.3-24-g4f1b


From e176de516a86baef1f48f3bf9e63818985f6a034 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 9 Nov 2017 18:16:58 +0200
Subject: Try testing on PHP master branch builds too (allowed failures)

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8f7838bdf..88c774283 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - master
   - hhvm
   
 env:
@@ -33,6 +34,7 @@ script: php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7
 matrix:
   allow_failures:
     - php: hhvm
+    - php: master
   exclude:
     - php: hhvm
       env: DB=pgsql
@@ -44,6 +46,8 @@ matrix:
       env: DB=mysql
     - php: 7.2
       env: DB=mysql
+    - php: master
+      env: DB=mysql
 
 branches:
   only:
-- 
cgit v1.2.3-24-g4f1b


From 8c9e51044d991868228dba8b9d5141998347dbfe Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 10 Nov 2017 15:02:42 +0200
Subject: Fix #5331

---
 system/helpers/url_helper.php                 | 2 +-
 tests/codeigniter/helpers/url_helper_test.php | 9 +++++++++
 user_guide_src/source/changelog.rst           | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index f6fb7d9eb..489f2d44e 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -393,7 +393,7 @@ if ( ! function_exists('auto_link'))
 	function auto_link($str, $type = 'both', $popup = FALSE)
 	{
 		// Find and replace any URLs.
-		if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[^\s()<>;]+\w/?#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER))
+		if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[a-z0-9]+(-+[a-z0-9]+)*(\.[a-z0-9]+(-+[a-z0-9]+)*)+(/([^\s()<>;]+\w)?/?)?#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER))
 		{
 			// Set our target HTML if using popup links.
 			$target = ($popup) ? ' target="_blank"' : '';
diff --git a/tests/codeigniter/helpers/url_helper_test.php b/tests/codeigniter/helpers/url_helper_test.php
index 5fbc364bf..83a8c0ec2 100644
--- a/tests/codeigniter/helpers/url_helper_test.php
+++ b/tests/codeigniter/helpers/url_helper_test.php
@@ -77,4 +77,13 @@ class Url_helper_test extends CI_TestCase {
 		}
 	}
 
+	// --------------------------------------------------------------------
+
+	public function test_issue_5331()
+	{
+		$this->assertEquals(
+			'this is some text that includes '.safe_mailto('www.email@domain.com').' which is causing an issue',
+			auto_link('this is some text that includes www.email@domain.com which is causing an issue')
+		);
+	}
 }
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index eb879c5a8..1641f7c97 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -21,6 +21,7 @@ Bug fixes for 3.1.7
 -  Fixed a bug (#5278) - :doc:`URL Helper ` function :php:func:`auto_link()` didn't detect trailing slashes in URLs.
 -  Fixed a regression (#5282) - :doc:`Query Builder ` method ``count_all_results()`` breaks ``ORDER BY`` clauses for subsequent queries.
 -  Fixed a bug (#5279) - :doc:`Query Builder ` didn't account for already escaped identifiers while applying database name prefixes.
+-  Fixed a bug (#5331) - :doc:`URL Helper ` function :php:func:`auto_link()` converted e-mail addresses starting with 'www.' to both "url" and "email" links.
 
 Version 3.1.6
 =============
-- 
cgit v1.2.3-24-g4f1b


From c9420849853a33a192c482e28c737e166d4fa698 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 10 Nov 2017 15:12:04 +0200
Subject: Close #5330

---
 system/core/Loader.php              |  8 +++++++-
 system/core/Model.php               | 12 ------------
 user_guide_src/source/changelog.rst |  1 +
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/system/core/Loader.php b/system/core/Loader.php
index fe2d43717..9813e99a9 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -303,6 +303,8 @@ class CI_Loader {
 				{
 					throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model");
 				}
+
+				log_message('info', 'CI_Model class loaded');
 			}
 			elseif ( ! class_exists('CI_Model', FALSE))
 			{
@@ -317,6 +319,8 @@ class CI_Loader {
 				{
 					throw new RuntimeException($app_path.$class.".php exists, but doesn't declare class ".$class);
 				}
+
+				log_message('info', config_item('subclass_prefix').'Model class loaded');
 			}
 		}
 
@@ -350,7 +354,9 @@ class CI_Loader {
 		}
 
 		$this->_ci_models[] = $name;
-		$CI->$name = new $model();
+		$model = new $model();
+		$CI->$name = $model;
+		log_message('info', 'Model "'.get_class($model).'" initialized');
 		return $this;
 	}
 
diff --git a/system/core/Model.php b/system/core/Model.php
index c809e7b84..691053a9c 100644
--- a/system/core/Model.php
+++ b/system/core/Model.php
@@ -48,18 +48,6 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  */
 class CI_Model {
 
-	/**
-	 * Class constructor
-	 *
-	 * @return	void
-	 */
-	public function __construct()
-	{
-		log_message('info', 'Model Class Initialized');
-	}
-
-	// --------------------------------------------------------------------
-
 	/**
 	 * __get magic
 	 *
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1641f7c97..1c35d9046 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -11,6 +11,7 @@ Release Date: Not Released
 
    -  Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names.
    -  Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names.
+   -  Updated :doc:`Loader Library ` method ``model()`` to log both ``CI_Model`` class loading and individual models' initialization.
    -  Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``.
 
 Bug fixes for 3.1.7
-- 
cgit v1.2.3-24-g4f1b


From ee8324368f2844aae0d558f1d194419a2181c281 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 15 Nov 2017 14:35:09 +0200
Subject: Partially revert c9420849853a33a192c482e28c737e166d4fa698; close
 #5332

---
 system/core/Model.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/system/core/Model.php b/system/core/Model.php
index 691053a9c..8bff9cf91 100644
--- a/system/core/Model.php
+++ b/system/core/Model.php
@@ -48,6 +48,14 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  */
 class CI_Model {
 
+	/**
+	 * Class constructor
+	 *
+	 * @link	https://github.com/bcit-ci/CodeIgniter/issues/5332
+	 * @return	void
+	 */
+	public function __construct() {}
+
 	/**
 	 * __get magic
 	 *
-- 
cgit v1.2.3-24-g4f1b


From 4a567782a2ece1ceffebfc1efa580f654df8be1f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 20 Nov 2017 09:58:03 +0200
Subject: [ci skip] More docs updates following #5330

---
 user_guide_src/source/general/controllers.rst        |  2 +-
 user_guide_src/source/general/core_classes.rst       |  9 ++-------
 user_guide_src/source/general/creating_libraries.rst |  3 ++-
 user_guide_src/source/general/models.rst             | 14 +-------------
 user_guide_src/source/libraries/sessions.rst         |  4 ++--
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/user_guide_src/source/general/controllers.rst b/user_guide_src/source/general/controllers.rst
index 5a111d8dc..14e583636 100644
--- a/user_guide_src/source/general/controllers.rst
+++ b/user_guide_src/source/general/controllers.rst
@@ -337,4 +337,4 @@ list.
 That's it!
 ==========
 
-That, in a nutshell, is all there is to know about controllers.
\ No newline at end of file
+That, in a nutshell, is all there is to know about controllers.
diff --git a/user_guide_src/source/general/core_classes.rst b/user_guide_src/source/general/core_classes.rst
index 79f73ef06..9ccded75c 100644
--- a/user_guide_src/source/general/core_classes.rst
+++ b/user_guide_src/source/general/core_classes.rst
@@ -83,6 +83,7 @@ application/core/MY_Input.php, and declare your class with::
 			public function __construct()
 			{
 				parent::__construct();
+				// Your own constructor code
 			}
 		}
 
@@ -98,12 +99,6 @@ your new class in your application controller's constructors.
 
 	class Welcome extends MY_Controller {
 
-		public function __construct()
-		{
-			parent::__construct();
-			// Your own constructor code
-		}
-
 		public function index()
 		{
 			$this->load->view('welcome_message');
@@ -119,4 +114,4 @@ To set your own sub-class prefix, open your
 	$config['subclass_prefix'] = 'MY_';
 
 Please note that all native CodeIgniter libraries are prefixed
-with CI\_ so DO NOT use that as your prefix.
\ No newline at end of file
+with CI\_ so DO NOT use that as your prefix.
diff --git a/user_guide_src/source/general/creating_libraries.rst b/user_guide_src/source/general/creating_libraries.rst
index d6b0631af..83742b619 100644
--- a/user_guide_src/source/general/creating_libraries.rst
+++ b/user_guide_src/source/general/creating_libraries.rst
@@ -224,6 +224,7 @@ extend the parent constructor::
 		public function __construct($config = array())
 		{
 			parent::__construct($config);
+			// Your own constructor code
 		}
 
 	}
@@ -256,4 +257,4 @@ To set your own sub-class prefix, open your
 	$config['subclass_prefix'] = 'MY_';
 
 Please note that all native CodeIgniter libraries are prefixed with CI\_
-so DO NOT use that as your prefix.
\ No newline at end of file
+so DO NOT use that as your prefix.
diff --git a/user_guide_src/source/general/models.rst b/user_guide_src/source/general/models.rst
index eb842e927..0b20164e9 100644
--- a/user_guide_src/source/general/models.rst
+++ b/user_guide_src/source/general/models.rst
@@ -67,12 +67,6 @@ The basic prototype for a model class is this::
 
 	class Model_name extends CI_Model {
 
-		public function __construct()
-		{
-			parent::__construct();
-			// Your own constructor code
-		}
-
 	}
 
 Where **Model_name** is the name of your class. Class names **must** have
@@ -83,12 +77,6 @@ The file name must match the class name. For example, if this is your class::
 
 	class User_model extends CI_Model {
 
-		public function __construct()
-		{
-			parent::__construct();
-			// Your own constructor code
-		}
-
 	}
 
 Your file will be this::
@@ -176,4 +164,4 @@ database. The following options for connecting are available to you:
 	$config['pconnect'] = FALSE;
 	$config['db_debug'] = TRUE;
 
-	$this->load->model('model_name', '', $config);
\ No newline at end of file
+	$this->load->model('model_name', '', $config);
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index b1f658d8f..994dc2e08 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -757,8 +757,8 @@ when creating a session driver for CodeIgniter:
     `_ interface.
 
     .. note:: You may notice that ``SessionHandlerInterface`` is provided
-    	by PHP since version 5.4.0. CodeIgniter will automatically declare
-    	the same interface if you're running an older PHP version.
+        by PHP since version 5.4.0. CodeIgniter will automatically declare
+        the same interface if you're running an older PHP version.
 
     The link will explain why and how.
 
-- 
cgit v1.2.3-24-g4f1b


From 75db0cfa371941cbd7743d0523bbe3460688fc37 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 28 Nov 2017 13:12:12 +0200
Subject: [ci skip] Merge pull request #5342 from aanbar/pagination-bc-fix

Preserve attributes from pagination config files

Related: #4454
---
 system/libraries/Pagination.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index f26f8a4ed..ece4edac9 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -339,6 +339,8 @@ class CI_Pagination {
 			}
 		}
 
+		// Enable rel attribute by default
+		isset($params['attributes']) OR $params['attributes'] = array();
 		$this->initialize($params);
 		log_message('info', 'Pagination Class Initialized');
 	}
@@ -353,8 +355,7 @@ class CI_Pagination {
 	 */
 	public function initialize(array $params = array())
 	{
-		isset($params['attributes']) OR $params['attributes'] = array();
-		if (is_array($params['attributes']))
+		if (isset($params['attributes']) && is_array($params['attributes']))
 		{
 			$this->_parse_attributes($params['attributes']);
 			unset($params['attributes']);
-- 
cgit v1.2.3-24-g4f1b


From 51dbfde284572f80f09360691525c181d26df0ae Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 28 Nov 2017 13:14:44 +0200
Subject: [ci skip] Polish changes from PR #5342

---
 system/libraries/Pagination.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index ece4edac9..3af70cb12 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -339,8 +339,10 @@ class CI_Pagination {
 			}
 		}
 
-		// Enable rel attribute by default
+		// _parse_attributes(), called by initialize(), needs to run at least once
+		// in order to enable "rel" attributes, and this triggers it.
 		isset($params['attributes']) OR $params['attributes'] = array();
+
 		$this->initialize($params);
 		log_message('info', 'Pagination Class Initialized');
 	}
-- 
cgit v1.2.3-24-g4f1b


From cf0e3e336ee872f1304bf0d19d39cc051db6c041 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 28 Nov 2017 13:16:48 +0200
Subject: [ci skip] Add changelog entry for PR #5342

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1c35d9046..c53f30f26 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -12,6 +12,7 @@ Release Date: Not Released
    -  Updated :doc:`Form Validation Library ` rule ``valid_email`` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names.
    -  Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names.
    -  Updated :doc:`Loader Library ` method ``model()`` to log both ``CI_Model`` class loading and individual models' initialization.
+   -  Updated :doc:`Pagination Library ` to preserve previously set attributes while calling ``initialize()``.
    -  Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``.
 
 Bug fixes for 3.1.7
-- 
cgit v1.2.3-24-g4f1b


From 9e2dcd4a6a70a997d8d741e8f113660f16b9a609 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 29 Nov 2017 12:59:45 +0200
Subject: [ci skip] Fix allow_get_array defaulting to FALSE if it doesn't exist

---
 system/core/Input.php               | 2 +-
 user_guide_src/source/changelog.rst | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/core/Input.php b/system/core/Input.php
index af4f87c1f..bb287ea4a 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -137,7 +137,7 @@ class CI_Input {
 	 */
 	public function __construct()
 	{
-		$this->_allow_get_array		= (config_item('allow_get_array') === TRUE);
+		$this->_allow_get_array		= (config_item('allow_get_array') !== FALSE);
 		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
 		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
 		$this->_standardize_newlines	= (bool) config_item('standardize_newlines');
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c53f30f26..ea201068b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -24,6 +24,7 @@ Bug fixes for 3.1.7
 -  Fixed a regression (#5282) - :doc:`Query Builder ` method ``count_all_results()`` breaks ``ORDER BY`` clauses for subsequent queries.
 -  Fixed a bug (#5279) - :doc:`Query Builder ` didn't account for already escaped identifiers while applying database name prefixes.
 -  Fixed a bug (#5331) - :doc:`URL Helper ` function :php:func:`auto_link()` converted e-mail addresses starting with 'www.' to both "url" and "email" links.
+-  Fixed a bug where ``$config['allow_get_array']`` defaulted to ``FALSE`` if it didn't exist in the config file.
 
 Version 3.1.6
 =============
-- 
cgit v1.2.3-24-g4f1b


From 20d9b0a9c03955da0010a3df91adcd9b8e6e7d58 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 20 Dec 2017 19:57:39 +0200
Subject: Merge pull request #5354 from carusogabriel/refactoring-tests

Refactoring tests

Conflicts resolved:
	tests/codeigniter/core/Utf8_test.php
	tests/codeigniter/database/query_builder/group_test.php
	tests/codeigniter/libraries/Form_validation_test.php
---
 tests/codeigniter/core/Benchmark_test.php          |  4 ++--
 tests/codeigniter/core/Common_test.php             |  6 +++---
 tests/codeigniter/core/Input_test.php              |  8 ++++----
 tests/codeigniter/core/Log_test.php                |  4 ++--
 tests/codeigniter/core/Security_test.php           |  2 +-
 tests/codeigniter/core/Utf8_test.php               |  4 ++--
 tests/codeigniter/core/compat/password_test.php    |  2 +-
 tests/codeigniter/database/DB_test.php             | 10 +++++-----
 .../database/query_builder/distinct_test.php       |  4 ++--
 .../database/query_builder/empty_test.php          |  4 ++--
 .../database/query_builder/escape_test.php         |  6 +++---
 .../database/query_builder/from_test.php           |  4 ++--
 .../database/query_builder/group_test.php          |  7 +++----
 .../database/query_builder/like_test.php           | 12 ++++++------
 .../database/query_builder/limit_test.php          |  6 +++---
 .../database/query_builder/order_test.php          |  6 +++---
 .../database/query_builder/select_test.php         |  6 +++---
 .../database/query_builder/truncate_test.php       |  6 +++---
 .../database/query_builder/where_test.php          | 14 +++++++-------
 tests/codeigniter/helpers/array_helper_test.php    |  8 ++++----
 tests/codeigniter/libraries/Encryption_test.php    |  4 ++--
 .../codeigniter/libraries/Form_validation_test.php |  2 +-
 tests/codeigniter/libraries/Table_test.php         | 22 +++++++++++-----------
 23 files changed, 75 insertions(+), 76 deletions(-)

diff --git a/tests/codeigniter/core/Benchmark_test.php b/tests/codeigniter/core/Benchmark_test.php
index 63b0e3d5a..33bd742b2 100644
--- a/tests/codeigniter/core/Benchmark_test.php
+++ b/tests/codeigniter/core/Benchmark_test.php
@@ -15,7 +15,7 @@ class Benchmark_test extends CI_TestCase {
 
 		$this->benchmark->mark('code_start');
 
-		$this->assertEquals(1, count($this->benchmark->marker));
+		$this->assertCount(1, $this->benchmark->marker);
 		$this->assertArrayHasKey('code_start', $this->benchmark->marker);
 	}
 
@@ -64,4 +64,4 @@ class Benchmark_test extends CI_TestCase {
 		$this->assertEquals('{memory_usage}', $this->benchmark->memory_usage());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/core/Common_test.php b/tests/codeigniter/core/Common_test.php
index ca19e5de0..effae50c5 100644
--- a/tests/codeigniter/core/Common_test.php
+++ b/tests/codeigniter/core/Common_test.php
@@ -4,8 +4,8 @@ class Common_test extends CI_TestCase {
 
 	public function test_is_php()
 	{
-		$this->assertEquals(TRUE, is_php('1.2.0'));
-		$this->assertEquals(FALSE, is_php('9999.9.9'));
+		$this->assertTrue(is_php('1.2.0'));
+		$this->assertFalse(is_php('9999.9.9'));
 	}
 
 	// ------------------------------------------------------------------------
@@ -66,4 +66,4 @@ class Common_test extends CI_TestCase {
 		$removed_string = 'Here is a string containing url_encoded invisible text.';
 		$this->assertEquals($removed_string, remove_invisible_characters($raw_string));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/core/Input_test.php b/tests/codeigniter/core/Input_test.php
index e1f4011b5..976941d41 100644
--- a/tests/codeigniter/core/Input_test.php
+++ b/tests/codeigniter/core/Input_test.php
@@ -24,8 +24,8 @@ class Input_test extends CI_TestCase {
 
 	public function test_get_not_exists()
 	{
-		$this->assertTrue($this->input->get() === array());
-		$this->assertTrue($this->input->get('foo') === NULL);
+		$this->assertSame(array(), $this->input->get());
+		$this->assertNull($this->input->get('foo'));
 	}
 
 	// --------------------------------------------------------------------
@@ -55,8 +55,8 @@ class Input_test extends CI_TestCase {
 
 	public function test_post_not_exists()
 	{
-		$this->assertTrue($this->input->post() === array());
-		$this->assertTrue($this->input->post('foo') === NULL);
+		$this->assertSame(array(), $this->input->post());
+		$this->assertNull($this->input->post('foo'));
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/core/Log_test.php b/tests/codeigniter/core/Log_test.php
index d5a6fcb6b..103af342b 100644
--- a/tests/codeigniter/core/Log_test.php
+++ b/tests/codeigniter/core/Log_test.php
@@ -28,7 +28,7 @@ class Log_test extends CI_TestCase {
 		$this->assertEquals($date_fmt->getValue($instance), 'd.m.Y');
 		$this->assertEquals($file_ext->getValue($instance), 'php');
 		$this->assertEquals($file_perms->getValue($instance), 0644);
-		$this->assertEquals($enabled->getValue($instance), FALSE);
+		$this->assertFalse($enabled->getValue($instance));
 
 		$this->ci_set_config('log_path', '');
 		$this->ci_set_config('log_threshold', '0');
@@ -60,4 +60,4 @@ class Log_test extends CI_TestCase {
 			"LEVEL - Timestamp --> Message\n"
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php
index 4c54ec9fa..c3113adba 100644
--- a/tests/codeigniter/core/Security_test.php
+++ b/tests/codeigniter/core/Security_test.php
@@ -252,7 +252,7 @@ class Security_test extends CI_TestCase {
 		// Perform hash
 		$this->security->xss_hash();
 
-		$this->assertTrue(preg_match('#^[0-9a-f]{32}$#iS', $this->security->xss_hash) === 1);
+		$this->assertRegExp('#^[0-9a-f]{32}$#iS', $this->security->xss_hash);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/core/Utf8_test.php b/tests/codeigniter/core/Utf8_test.php
index 7e6ffd930..a0327dbd7 100644
--- a/tests/codeigniter/core/Utf8_test.php
+++ b/tests/codeigniter/core/Utf8_test.php
@@ -61,7 +61,7 @@ class Utf8_test extends CI_TestCase {
 		elseif (ICONV_ENABLED)
 		{
 			// This is a known issue, iconv doesn't always work with //IGNORE
-			$this->assertTrue(in_array($this->utf8->clean_string($illegal_utf8), array('тест', ''), TRUE));
+			$this->assertContains($utf8->clean_string($illegal_utf8), array('тест', ''));
 		}
 		else
 		{
@@ -88,4 +88,4 @@ class Utf8_test extends CI_TestCase {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/core/compat/password_test.php b/tests/codeigniter/core/compat/password_test.php
index 77f5eba4e..b6dbcfab1 100644
--- a/tests/codeigniter/core/compat/password_test.php
+++ b/tests/codeigniter/core/compat/password_test.php
@@ -156,4 +156,4 @@ class password_test extends CI_TestCase {
 		$this->assertTrue(password_verify('rasmuslerdorf', '$2a$07$usesomesillystringfore2uDLvp1Ii2e./U9C8sBjqp8I90dH6hi'));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/DB_test.php b/tests/codeigniter/database/DB_test.php
index dc4fae986..9d53fd6f2 100644
--- a/tests/codeigniter/database/DB_test.php
+++ b/tests/codeigniter/database/DB_test.php
@@ -36,8 +36,8 @@ class DB_test extends CI_TestCase {
 
 		$db = Mock_Database_DB::DB($connection->set_dsn(DB_DRIVER), TRUE);
 
-		$this->assertTrue($db instanceof CI_DB);
-		$this->assertTrue($db instanceof CI_DB_Driver);
+		$this->assertInstanceOf('CI_DB', $db);
+		$this->assertInstanceOf('CI_DB_Driver', $db);
 	}
 
 	// ------------------------------------------------------------------------
@@ -53,9 +53,9 @@ class DB_test extends CI_TestCase {
 		$connection = new Mock_Database_DB($config);
 		$db = Mock_Database_DB::DB($connection->set_dsn(DB_DRIVER.'_failover'), TRUE);
 
-		$this->assertTrue($db instanceof CI_DB);
-		$this->assertTrue($db instanceof CI_DB_Driver);
+		$this->assertInstanceOf('CI_DB', $db);
+		$this->assertInstanceOf('CI_DB_Driver', $db);
 	}
 */
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/distinct_test.php b/tests/codeigniter/database/query_builder/distinct_test.php
index cc98009ce..81fabe448 100644
--- a/tests/codeigniter/database/query_builder/distinct_test.php
+++ b/tests/codeigniter/database/query_builder/distinct_test.php
@@ -27,7 +27,7 @@ class Distinct_test extends CI_TestCase {
 					->get('user')
 					->result_array();
 
-		$this->assertEquals(3, count($users));
+		$this->assertCount(3, $users);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/empty_test.php b/tests/codeigniter/database/query_builder/empty_test.php
index d1f56285f..3f63a60f5 100644
--- a/tests/codeigniter/database/query_builder/empty_test.php
+++ b/tests/codeigniter/database/query_builder/empty_test.php
@@ -25,7 +25,7 @@ class Empty_test extends CI_TestCase {
 		// Check initial record
 		$jobs = $this->db->get('job')->result_array();
 
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 
 		// Do the empty
 		$this->db->empty_table('job');
@@ -36,4 +36,4 @@ class Empty_test extends CI_TestCase {
 		$this->assertEmpty($jobs->result_array());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/escape_test.php b/tests/codeigniter/database/query_builder/escape_test.php
index 27e678f22..de6cd0a9d 100644
--- a/tests/codeigniter/database/query_builder/escape_test.php
+++ b/tests/codeigniter/database/query_builder/escape_test.php
@@ -37,7 +37,7 @@ class Escape_test extends CI_TestCase {
 		$res = $this->db->query($sql)->result_array();
 
 		// Check the result
-		$this->assertEquals(1, count($res));
+		$this->assertCount(1, $res);
 	}
 
 	// ------------------------------------------------------------------------
@@ -62,7 +62,7 @@ class Escape_test extends CI_TestCase {
 		$res = $this->db->query($sql)->result_array();
 
 		// Check the result
-		$this->assertEquals(2, count($res));
+		$this->assertCount(2, $res);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/from_test.php b/tests/codeigniter/database/query_builder/from_test.php
index 7aaae348d..5a4ac690d 100644
--- a/tests/codeigniter/database/query_builder/from_test.php
+++ b/tests/codeigniter/database/query_builder/from_test.php
@@ -26,7 +26,7 @@ class From_test extends CI_TestCase {
 					->get()
 					->result_array();
 
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -46,4 +46,4 @@ class From_test extends CI_TestCase {
 		$this->assertEquals('Awesome job, but sometimes makes you bored', $job1->description);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/group_test.php b/tests/codeigniter/database/query_builder/group_test.php
index 5249f7c87..b40e5e507 100644
--- a/tests/codeigniter/database/query_builder/group_test.php
+++ b/tests/codeigniter/database/query_builder/group_test.php
@@ -28,7 +28,7 @@ class Group_test extends CI_TestCase {
 					->get()
 					->result_array();
 
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -45,7 +45,6 @@ class Group_test extends CI_TestCase {
 					->get()
 					->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 	}
-
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/like_test.php b/tests/codeigniter/database/query_builder/like_test.php
index 2736fbe0b..3672afae3 100644
--- a/tests/codeigniter/database/query_builder/like_test.php
+++ b/tests/codeigniter/database/query_builder/like_test.php
@@ -44,7 +44,7 @@ class Like_test extends CI_TestCase {
 							->result_array();
 
 		// Check the result
-		$this->assertEquals(3, count($jobs));
+		$this->assertCount(3, $jobs);
 		$this->assertEquals('Developer', $jobs[0]['name']);
 		$this->assertEquals('Politician', $jobs[1]['name']);
 		$this->assertEquals('Musician', $jobs[2]['name']);
@@ -62,7 +62,7 @@ class Like_test extends CI_TestCase {
 							->result_array();
 
 		// Check the result
-		$this->assertEquals(3, count($jobs));
+		$this->assertCount(3, $jobs);
 		$this->assertEquals('Politician', $jobs[0]['name']);
 		$this->assertEquals('Accountant', $jobs[1]['name']);
 		$this->assertEquals('Musician', $jobs[2]['name']);
@@ -81,7 +81,7 @@ class Like_test extends CI_TestCase {
 							->result_array();
 
 		// Check the result
-		$this->assertEquals(3, count($jobs));
+		$this->assertCount(3, $jobs);
 		$this->assertEquals('Politician', $jobs[0]['name']);
 		$this->assertEquals('Accountant', $jobs[1]['name']);
 		$this->assertEquals('Musician', $jobs[2]['name']);
@@ -99,8 +99,8 @@ class Like_test extends CI_TestCase {
 		$spaces = $this->db->like('value', '   ')->get('misc')->result_array();
 		$tabs = $this->db->like('value', "\t")->get('misc')->result_array();
 
-		$this->assertEquals(1, count($spaces));
-		$this->assertEquals(1, count($tabs));
+		$this->assertCount(1, $spaces);
+		$this->assertCount(1, $tabs);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/limit_test.php b/tests/codeigniter/database/query_builder/limit_test.php
index a0954c7ab..a1976d457 100644
--- a/tests/codeigniter/database/query_builder/limit_test.php
+++ b/tests/codeigniter/database/query_builder/limit_test.php
@@ -26,7 +26,7 @@ class Limit_test extends CI_TestCase {
 		                      ->get('job')
 		                      ->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -40,9 +40,9 @@ class Limit_test extends CI_TestCase {
 		                      ->get('job')
 		                      ->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 		$this->assertEquals('Accountant', $jobs[0]['name']);
 		$this->assertEquals('Musician', $jobs[1]['name']);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/order_test.php b/tests/codeigniter/database/query_builder/order_test.php
index 46f452bae..ff5bc543d 100644
--- a/tests/codeigniter/database/query_builder/order_test.php
+++ b/tests/codeigniter/database/query_builder/order_test.php
@@ -27,7 +27,7 @@ class Order_test extends CI_TestCase {
 		                      ->result_array();
 
 		// Check the result
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 		$this->assertEquals('Accountant', $jobs[0]['name']);
 		$this->assertEquals('Developer', $jobs[1]['name']);
 		$this->assertEquals('Musician', $jobs[2]['name']);
@@ -45,11 +45,11 @@ class Order_test extends CI_TestCase {
 		                      ->get('job')
 		                      ->result_array();
 
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 		$this->assertEquals('Politician', $jobs[0]['name']);
 		$this->assertEquals('Musician', $jobs[1]['name']);
 		$this->assertEquals('Developer', $jobs[2]['name']);
 		$this->assertEquals('Accountant', $jobs[3]['name']);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/select_test.php b/tests/codeigniter/database/query_builder/select_test.php
index 877b5d8c0..93b5c3d46 100644
--- a/tests/codeigniter/database/query_builder/select_test.php
+++ b/tests/codeigniter/database/query_builder/select_test.php
@@ -28,8 +28,8 @@ class Select_test extends CI_TestCase {
 
 		// Check rows item
 		$this->assertArrayHasKey('name',$jobs_name[0]);
-		$this->assertFalse(array_key_exists('id', $jobs_name[0]));
-		$this->assertFalse(array_key_exists('description', $jobs_name[0]));
+		$this->assertArrayNotHasKey('id', $jobs_name[0]);
+		$this->assertArrayNotHasKey('description', $jobs_name[0]);
 	}
 
 	// ------------------------------------------------------------------------
@@ -92,4 +92,4 @@ class Select_test extends CI_TestCase {
 		$this->assertEquals('10', $job_sum->id);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/truncate_test.php b/tests/codeigniter/database/query_builder/truncate_test.php
index 09923c7f1..64abe2872 100644
--- a/tests/codeigniter/database/query_builder/truncate_test.php
+++ b/tests/codeigniter/database/query_builder/truncate_test.php
@@ -24,7 +24,7 @@ class Truncate_test extends CI_TestCase {
 	{
 		// Check initial record
 		$jobs = $this->db->get('job')->result_array();
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 
 		// Do the empty
 		$this->db->truncate('job');
@@ -43,7 +43,7 @@ class Truncate_test extends CI_TestCase {
 	{
 		// Check initial record
 		$users = $this->db->get('user')->result_array();
-		$this->assertEquals(4, count($users));
+		$this->assertCount(4, $users);
 
 		// Do the empty
 		$this->db->from('user')->truncate();
@@ -53,4 +53,4 @@ class Truncate_test extends CI_TestCase {
 		$this->assertEmpty($users->result_array());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/database/query_builder/where_test.php b/tests/codeigniter/database/query_builder/where_test.php
index 46a7fa2eb..8a7a09ddb 100644
--- a/tests/codeigniter/database/query_builder/where_test.php
+++ b/tests/codeigniter/database/query_builder/where_test.php
@@ -36,7 +36,7 @@ class Where_test extends CI_TestCase {
 	public function test_where_custom_key_value()
 	{
 		$jobs = $this->db->where('id !=', 1)->get('job')->result_array();
-		$this->assertEquals(3, count($jobs));
+		$this->assertCount(3, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -49,7 +49,7 @@ class Where_test extends CI_TestCase {
 		$where = array('id >' => 2, 'name !=' => 'Accountant');
 		$jobs = $this->db->where($where)->get('job')->result_array();
 
-		$this->assertEquals(1, count($jobs));
+		$this->assertCount(1, $jobs);
 
 		// Should be Musician
 		$job = current($jobs);
@@ -66,7 +66,7 @@ class Where_test extends CI_TestCase {
 		$where = "id > 2 AND name != 'Accountant'";
 		$jobs = $this->db->where($where)->get('job')->result_array();
 
-		$this->assertEquals(1, count($jobs));
+		$this->assertCount(1, $jobs);
 
 		// Should be Musician
 		$job = current($jobs);
@@ -85,7 +85,7 @@ class Where_test extends CI_TestCase {
 							->get('job')
 							->result_array();
 
-		$this->assertEquals(3, count($jobs));
+		$this->assertCount(3, $jobs);
 		$this->assertEquals('Developer', $jobs[0]['name']);
 		$this->assertEquals('Politician', $jobs[1]['name']);
 		$this->assertEquals('Musician', $jobs[2]['name']);
@@ -102,7 +102,7 @@ class Where_test extends CI_TestCase {
 							->get('job')
 							->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 		$this->assertEquals('Politician', $jobs[0]['name']);
 		$this->assertEquals('Accountant', $jobs[1]['name']);
 	}
@@ -118,7 +118,7 @@ class Where_test extends CI_TestCase {
 							->get('job')
 							->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 		$this->assertEquals('Developer', $jobs[0]['name']);
 		$this->assertEquals('Musician', $jobs[1]['name']);
 	}
@@ -131,4 +131,4 @@ class Where_test extends CI_TestCase {
 		$sql = $this->db->where('foo', $input)->get_compiled_select('dummy');
 		$this->assertEquals("'".$input."'", substr($sql, -20));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/helpers/array_helper_test.php b/tests/codeigniter/helpers/array_helper_test.php
index 5a9958971..b2409c330 100644
--- a/tests/codeigniter/helpers/array_helper_test.php
+++ b/tests/codeigniter/helpers/array_helper_test.php
@@ -31,15 +31,15 @@ class Array_helper_test extends CI_TestCase {
 		$this->assertEquals('my string', random_element('my string'));
 
 		// Test sending an array
-		$this->assertEquals(TRUE, in_array(random_element($this->my_array), $this->my_array));
+		$this->assertContains(random_element($this->my_array), $this->my_array);
 	}
 
 	// ------------------------------------------------------------------------
 
 	public function test_elements()
 	{
-		$this->assertEquals(TRUE, is_array(elements('test', $this->my_array)));
-		$this->assertEquals(TRUE, is_array(elements('foo', $this->my_array)));
+		$this->assertInternalType('array', elements('test', $this->my_array));
+		$this->assertInternalType('array', elements('foo', $this->my_array));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/libraries/Encryption_test.php b/tests/codeigniter/libraries/Encryption_test.php
index 99c5d4b9d..8e411d9fa 100644
--- a/tests/codeigniter/libraries/Encryption_test.php
+++ b/tests/codeigniter/libraries/Encryption_test.php
@@ -151,7 +151,7 @@ class Encryption_test extends CI_TestCase {
 			'hmac_key' => str_repeat("\x0", 16)
 		);
 
-		$this->assertTrue(is_array($this->encryption->__get_params($params)));
+		$this->assertInternalType('array', $this->encryption->__get_params($params));
 
 		$params['base64'] = TRUE;
 		$params['hmac_digest'] = 'sha512';
@@ -257,7 +257,7 @@ class Encryption_test extends CI_TestCase {
 			return $this->markTestSkipped('ext/mcrypt is deprecated since PHP 7.1 and will generate notices here.');
 		}
 
-		$this->assertTrue(is_resource($this->encryption->__driver_get_handle('mcrypt', 'rijndael-128', 'cbc')));
+		$this->assertInternalType('resource', $this->encryption->__driver_get_handle('mcrypt', 'rijndael-128', 'cbc'));
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/libraries/Form_validation_test.php b/tests/codeigniter/libraries/Form_validation_test.php
index fa9e86c97..3280f5bd8 100644
--- a/tests/codeigniter/libraries/Form_validation_test.php
+++ b/tests/codeigniter/libraries/Form_validation_test.php
@@ -358,7 +358,7 @@ class Form_validation_test extends CI_TestCase {
 		$this->form_validation->run();
 		$error_msg = $this->form_validation->error('foo');
 
-		$this->assertTrue(strrpos($error_msg, $prefix) === 0);
+		$this->assertStringStartsWith($prefix, $error_msg);
 		$this->assertTrue(strrpos($error_msg, $suffix, -strlen($suffix)) === (strlen($error_msg) - strlen($suffix)));
 
 		$_POST = array();
diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index 8e7452474..f505a43fc 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -67,7 +67,7 @@ class Table_test extends CI_TestCase {
 		$this->table->add_row('your', 'pony', 'stinks');
 		$this->table->add_row('my pony', '>', 'your pony');
 
-		$this->assertEquals(count($this->table->rows), 3);
+		$this->assertCount(3, $this->table->rows);
 
 		$this->assertEquals(
 			array(
@@ -188,8 +188,8 @@ class Table_test extends CI_TestCase {
 		}
 
 		$this->assertFalse($this->table->auto_heading);
-		$this->assertEquals(count($this->table->heading), 3);
-		$this->assertEquals(count($this->table->rows), 2);
+		$this->assertCount(3, $this->table->heading);
+		$this->assertCount(2, $this->table->rows);
 
 		$this->table->clear();
 
@@ -213,7 +213,7 @@ class Table_test extends CI_TestCase {
 		$this->table->clear();
 
 		$this->table->set_from_array($data);
-		$this->assertEquals(count($this->table->rows), 2);
+		$this->assertCount(2, $this->table->rows);
 
 		$expected = array(
 			array('data' => 'name'),
@@ -270,14 +270,14 @@ class Table_test extends CI_TestCase {
 		$table = $this->table->generate($data);
 
 		// Test the table header
-		$this->assertTrue(strpos($table, 'Name') !== FALSE);
-		$this->assertTrue(strpos($table, 'Color') !== FALSE);
-		$this->assertTrue(strpos($table, 'Size') !== FALSE);
+		$this->assertContains('Name', $table);
+		$this->assertContains('Color', $table);
+		$this->assertContains('Size', $table);
 
 		// Test the first entry
-		$this->assertTrue(strpos($table, 'Fred') !== FALSE);
-		$this->assertTrue(strpos($table, 'Blue') !== FALSE);
-		$this->assertTrue(strpos($table, 'Small') !== FALSE);
+		$this->assertContains('Fred', $table);
+		$this->assertContains('Blue', $table);
+		$this->assertContains('Small', $table);
 	}
 
 }
@@ -297,4 +297,4 @@ class DB_result_dummy extends CI_DB_result
 			array('name' => 'Foo Bar', 'email' => 'foo@bar.com')
 		);
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-24-g4f1b


From fbe4d79ca0a70f404dce628d66deeaa3d90a2225 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 27 Dec 2017 19:49:03 +0200
Subject: Merge pull request #5367 from carusogabriel/clean-elses

Clean elses
---
 system/database/DB_forge.php         |  6 ++----
 system/database/DB_result.php        |  9 ++++-----
 system/libraries/Email.php           | 12 ++++--------
 system/libraries/Encryption.php      |  6 ++----
 system/libraries/Session/Session.php |  6 ++----
 system/libraries/Upload.php          |  6 ++----
 system/libraries/Xmlrpcs.php         | 18 ++++++------------
 tests/mocks/ci_testcase.php          |  6 ++----
 8 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index 3cb02ca4e..f1e0b1419 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -382,10 +382,8 @@ abstract class CI_DB_forge {
 			{
 				return TRUE;
 			}
-			else
-			{
-				$if_not_exists = FALSE;
-			}
+
+			$if_not_exists = FALSE;
 		}
 
 		$sql = ($if_not_exists)
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index 98d8876a7..40b8fbb74 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -163,10 +163,8 @@ class CI_DB_result {
 		{
 			return $this->result_object();
 		}
-		else
-		{
-			return $this->custom_result_object($type);
-		}
+
+		return $this->custom_result_object($type);
 	}
 
 	// --------------------------------------------------------------------
@@ -336,7 +334,8 @@ class CI_DB_result {
 
 		if ($type === 'object') return $this->row_object($n);
 		elseif ($type === 'array') return $this->row_array($n);
-		else return $this->custom_row_object($n, $type);
+
+		return $this->custom_row_object($n, $type);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 948cdb5c2..8fefcbab9 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -961,10 +961,8 @@ class CI_Email {
 		{
 			return 'plain-attach';
 		}
-		else
-		{
-			return 'plain';
-		}
+
+		return 'plain';
 	}
 
 	// --------------------------------------------------------------------
@@ -2267,10 +2265,8 @@ class CI_Email {
 				usleep(250000);
 				continue;
 			}
-			else
-			{
-				$timestamp = 0;
-			}
+
+			$timestamp = 0;
 		}
 
 		if ($result === FALSE)
diff --git a/system/libraries/Encryption.php b/system/libraries/Encryption.php
index c1e454dda..9a21bae4c 100644
--- a/system/libraries/Encryption.php
+++ b/system/libraries/Encryption.php
@@ -682,10 +682,8 @@ class CI_Encryption {
 			{
 				return FALSE;
 			}
-			else
-			{
-				$params['mode'] = $this->_modes[$this->_driver][$params['mode']];
-			}
+
+			$params['mode'] = $this->_modes[$this->_driver][$params['mode']];
 		}
 
 		if (isset($params['hmac']) && $params['hmac'] === FALSE)
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index eb433de64..bf22227d8 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -241,10 +241,8 @@ class CI_Session {
 			{
 				return $prefix.$class;
 			}
-			else
-			{
-				log_message('debug', 'Session: '.$prefix.$class.".php found but it doesn't declare class ".$prefix.$class.'.');
-			}
+
+			log_message('debug', 'Session: '.$prefix.$class.".php found but it doesn't declare class ".$prefix.$class.'.');
 		}
 
 		return 'CI_'.$class;
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 0ad8dd375..3b450c561 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -678,10 +678,8 @@ class CI_Upload {
 			$this->set_error('upload_bad_filename', 'debug');
 			return FALSE;
 		}
-		else
-		{
-			return $new_filename;
-		}
+
+		return $new_filename;
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index 0274f13b6..7f760a088 100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
@@ -402,15 +402,11 @@ class CI_Xmlrpcs extends CI_Xmlrpc {
 			{
 				return get_instance()->{$method_parts[1]}($m);
 			}
-			else
-			{
-				return $this->object->{$method_parts[1]}($m);
-			}
-		}
-		else
-		{
-			return call_user_func($this->methods[$methName]['function'], $m);
+
+			return $this->object->{$method_parts[1]}($m);
 		}
+
+		return call_user_func($this->methods[$methName]['function'], $m);
 	}
 
 	// --------------------------------------------------------------------
@@ -499,10 +495,8 @@ class CI_Xmlrpcs extends CI_Xmlrpc {
 
 			return new XML_RPC_Response(new XML_RPC_Values($docstring, 'string'));
 		}
-		else
-		{
-			return new XML_RPC_Response(0, $this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
-		}
+
+		return new XML_RPC_Response(0, $this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/mocks/ci_testcase.php b/tests/mocks/ci_testcase.php
index a2c37b92e..e5c86322c 100644
--- a/tests/mocks/ci_testcase.php
+++ b/tests/mocks/ci_testcase.php
@@ -377,10 +377,8 @@ class CI_TestCase extends PHPUnit_Framework_TestCase {
 		{
 			return call_user_func_array($this->{$method},$args);
 		}
-		else
-		{
-			return parent::__call($method, $args);
-		}
+
+		return parent::__call($method, $args);
 	}
 
 }
-- 
cgit v1.2.3-24-g4f1b


From 47df0884591b8678b6873be58b1dc571363e7b28 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 5 Jan 2018 17:29:31 +0200
Subject: [ci skip] Merge pull request #5369 from
 tianhe1986/develop_cache_memcache

Cache_memcached: setting initial value with increment/decrement when not exist
---
 system/libraries/Cache/drivers/Cache_memcached.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php
index b642a2c03..ef020f23e 100644
--- a/system/libraries/Cache/drivers/Cache_memcached.php
+++ b/system/libraries/Cache/drivers/Cache_memcached.php
@@ -198,7 +198,12 @@ class CI_Cache_memcached extends CI_Driver {
 	 */
 	public function increment($id, $offset = 1)
 	{
-		return $this->_memcached->increment($id, $offset);
+		if (($result = $this->_memcached->increment($id, $offset)) === FALSE)
+		{
+			return $this->_memcached->add($id, $offset) ? $offset : FALSE;
+		}
+
+		return $result;
 	}
 
 	// ------------------------------------------------------------------------
@@ -212,7 +217,12 @@ class CI_Cache_memcached extends CI_Driver {
 	 */
 	public function decrement($id, $offset = 1)
 	{
-		return $this->_memcached->decrement($id, $offset);
+		if (($result = $this->_memcached->decrement($id, $offset)) === FALSE)
+		{
+			return $this->_memcached->add($id, 0) ? 0 : FALSE;
+		}
+
+		return $result;
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 97e50f72d5920c13d15a0178f5065b06d6e53903 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 5 Jan 2018 17:32:38 +0200
Subject: [ci skip] Add changelog entry for PR #5369

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ea201068b..619fa4651 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -13,6 +13,7 @@ Release Date: Not Released
    -  Updated :doc:`Email Library ` to use ``INTL_IDNA_VARIANT_UTS46`` for non-ASCII domain names.
    -  Updated :doc:`Loader Library ` method ``model()`` to log both ``CI_Model`` class loading and individual models' initialization.
    -  Updated :doc:`Pagination Library ` to preserve previously set attributes while calling ``initialize()``.
+   -  Updated :doc:`Cache Library ` to automatically add items to cache on ``increment()``, ``decrement()`` calls for missing keys.
    -  Deprecated usage of :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()` with parameters other than ``$data``.
 
 Bug fixes for 3.1.7
-- 
cgit v1.2.3-24-g4f1b


From cce6bd170f24cf0f10ca0b58150d0324433a66be Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 9 Jan 2018 11:32:02 +0200
Subject: [ci skip] Merge pull request #5376 from jim-parry/copyright-update

Annual copyright update

Conflicts resolved:
	system/libraries/Cache/drivers/Cache_apcu.php
---
 index.php                                                      | 4 ++--
 license.txt                                                    | 2 +-
 system/core/Benchmark.php                                      | 4 ++--
 system/core/CodeIgniter.php                                    | 4 ++--
 system/core/Common.php                                         | 4 ++--
 system/core/Config.php                                         | 4 ++--
 system/core/Controller.php                                     | 4 ++--
 system/core/Exceptions.php                                     | 4 ++--
 system/core/Hooks.php                                          | 4 ++--
 system/core/Input.php                                          | 4 ++--
 system/core/Lang.php                                           | 4 ++--
 system/core/Loader.php                                         | 4 ++--
 system/core/Log.php                                            | 4 ++--
 system/core/Model.php                                          | 4 ++--
 system/core/Output.php                                         | 4 ++--
 system/core/Router.php                                         | 4 ++--
 system/core/Security.php                                       | 4 ++--
 system/core/URI.php                                            | 4 ++--
 system/core/Utf8.php                                           | 4 ++--
 system/core/compat/hash.php                                    | 4 ++--
 system/core/compat/mbstring.php                                | 4 ++--
 system/core/compat/password.php                                | 4 ++--
 system/core/compat/standard.php                                | 4 ++--
 system/database/DB.php                                         | 4 ++--
 system/database/DB_cache.php                                   | 4 ++--
 system/database/DB_driver.php                                  | 4 ++--
 system/database/DB_forge.php                                   | 4 ++--
 system/database/DB_query_builder.php                           | 4 ++--
 system/database/DB_result.php                                  | 4 ++--
 system/database/DB_utility.php                                 | 4 ++--
 system/database/drivers/cubrid/cubrid_driver.php               | 4 ++--
 system/database/drivers/cubrid/cubrid_forge.php                | 4 ++--
 system/database/drivers/cubrid/cubrid_result.php               | 4 ++--
 system/database/drivers/cubrid/cubrid_utility.php              | 4 ++--
 system/database/drivers/ibase/ibase_driver.php                 | 4 ++--
 system/database/drivers/ibase/ibase_forge.php                  | 4 ++--
 system/database/drivers/ibase/ibase_result.php                 | 4 ++--
 system/database/drivers/ibase/ibase_utility.php                | 4 ++--
 system/database/drivers/mssql/mssql_driver.php                 | 4 ++--
 system/database/drivers/mssql/mssql_forge.php                  | 4 ++--
 system/database/drivers/mssql/mssql_result.php                 | 4 ++--
 system/database/drivers/mssql/mssql_utility.php                | 4 ++--
 system/database/drivers/mysql/mysql_driver.php                 | 4 ++--
 system/database/drivers/mysql/mysql_forge.php                  | 4 ++--
 system/database/drivers/mysql/mysql_result.php                 | 4 ++--
 system/database/drivers/mysql/mysql_utility.php                | 4 ++--
 system/database/drivers/mysqli/mysqli_driver.php               | 4 ++--
 system/database/drivers/mysqli/mysqli_forge.php                | 4 ++--
 system/database/drivers/mysqli/mysqli_result.php               | 4 ++--
 system/database/drivers/mysqli/mysqli_utility.php              | 4 ++--
 system/database/drivers/oci8/oci8_driver.php                   | 4 ++--
 system/database/drivers/oci8/oci8_forge.php                    | 4 ++--
 system/database/drivers/oci8/oci8_result.php                   | 4 ++--
 system/database/drivers/oci8/oci8_utility.php                  | 4 ++--
 system/database/drivers/odbc/odbc_driver.php                   | 4 ++--
 system/database/drivers/odbc/odbc_forge.php                    | 4 ++--
 system/database/drivers/odbc/odbc_result.php                   | 4 ++--
 system/database/drivers/odbc/odbc_utility.php                  | 4 ++--
 system/database/drivers/pdo/pdo_driver.php                     | 4 ++--
 system/database/drivers/pdo/pdo_forge.php                      | 4 ++--
 system/database/drivers/pdo/pdo_result.php                     | 4 ++--
 system/database/drivers/pdo/pdo_utility.php                    | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_4d_driver.php       | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_4d_forge.php        | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php   | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php    | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php    | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php     | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php  | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php      | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php       | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_informix_driver.php | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_informix_forge.php  | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php    | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php     | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_oci_driver.php      | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_oci_forge.php       | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php     | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php      | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php    | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php     | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php   | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php    | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php   | 4 ++--
 system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php    | 4 ++--
 system/database/drivers/postgre/postgre_driver.php             | 4 ++--
 system/database/drivers/postgre/postgre_forge.php              | 4 ++--
 system/database/drivers/postgre/postgre_result.php             | 4 ++--
 system/database/drivers/postgre/postgre_utility.php            | 4 ++--
 system/database/drivers/sqlite/sqlite_driver.php               | 4 ++--
 system/database/drivers/sqlite/sqlite_forge.php                | 4 ++--
 system/database/drivers/sqlite/sqlite_result.php               | 4 ++--
 system/database/drivers/sqlite/sqlite_utility.php              | 4 ++--
 system/database/drivers/sqlite3/sqlite3_driver.php             | 4 ++--
 system/database/drivers/sqlite3/sqlite3_forge.php              | 4 ++--
 system/database/drivers/sqlite3/sqlite3_result.php             | 4 ++--
 system/database/drivers/sqlite3/sqlite3_utility.php            | 4 ++--
 system/database/drivers/sqlsrv/sqlsrv_driver.php               | 4 ++--
 system/database/drivers/sqlsrv/sqlsrv_forge.php                | 4 ++--
 system/database/drivers/sqlsrv/sqlsrv_result.php               | 4 ++--
 system/database/drivers/sqlsrv/sqlsrv_utility.php              | 4 ++--
 system/helpers/array_helper.php                                | 4 ++--
 system/helpers/captcha_helper.php                              | 4 ++--
 system/helpers/cookie_helper.php                               | 4 ++--
 system/helpers/date_helper.php                                 | 4 ++--
 system/helpers/directory_helper.php                            | 4 ++--
 system/helpers/download_helper.php                             | 4 ++--
 system/helpers/email_helper.php                                | 4 ++--
 system/helpers/file_helper.php                                 | 4 ++--
 system/helpers/form_helper.php                                 | 4 ++--
 system/helpers/html_helper.php                                 | 4 ++--
 system/helpers/inflector_helper.php                            | 4 ++--
 system/helpers/language_helper.php                             | 4 ++--
 system/helpers/number_helper.php                               | 4 ++--
 system/helpers/path_helper.php                                 | 4 ++--
 system/helpers/security_helper.php                             | 4 ++--
 system/helpers/smiley_helper.php                               | 4 ++--
 system/helpers/string_helper.php                               | 4 ++--
 system/helpers/text_helper.php                                 | 4 ++--
 system/helpers/typography_helper.php                           | 4 ++--
 system/helpers/url_helper.php                                  | 4 ++--
 system/helpers/xml_helper.php                                  | 4 ++--
 system/language/english/calendar_lang.php                      | 4 ++--
 system/language/english/date_lang.php                          | 4 ++--
 system/language/english/db_lang.php                            | 4 ++--
 system/language/english/email_lang.php                         | 4 ++--
 system/language/english/form_validation_lang.php               | 4 ++--
 system/language/english/ftp_lang.php                           | 4 ++--
 system/language/english/imglib_lang.php                        | 4 ++--
 system/language/english/migration_lang.php                     | 4 ++--
 system/language/english/number_lang.php                        | 4 ++--
 system/language/english/pagination_lang.php                    | 4 ++--
 system/language/english/profiler_lang.php                      | 4 ++--
 system/language/english/unit_test_lang.php                     | 4 ++--
 system/language/english/upload_lang.php                        | 4 ++--
 system/libraries/Cache/Cache.php                               | 4 ++--
 system/libraries/Cache/drivers/Cache_apc.php                   | 4 ++--
 system/libraries/Cache/drivers/Cache_dummy.php                 | 4 ++--
 system/libraries/Cache/drivers/Cache_file.php                  | 4 ++--
 system/libraries/Cache/drivers/Cache_memcached.php             | 4 ++--
 system/libraries/Cache/drivers/Cache_redis.php                 | 4 ++--
 system/libraries/Cache/drivers/Cache_wincache.php              | 4 ++--
 system/libraries/Calendar.php                                  | 4 ++--
 system/libraries/Cart.php                                      | 4 ++--
 system/libraries/Driver.php                                    | 4 ++--
 system/libraries/Email.php                                     | 4 ++--
 system/libraries/Encrypt.php                                   | 4 ++--
 system/libraries/Encryption.php                                | 4 ++--
 system/libraries/Form_validation.php                           | 4 ++--
 system/libraries/Ftp.php                                       | 4 ++--
 system/libraries/Image_lib.php                                 | 4 ++--
 system/libraries/Javascript.php                                | 4 ++--
 system/libraries/Javascript/Jquery.php                         | 4 ++--
 system/libraries/Migration.php                                 | 4 ++--
 system/libraries/Pagination.php                                | 4 ++--
 system/libraries/Parser.php                                    | 4 ++--
 system/libraries/Profiler.php                                  | 4 ++--
 system/libraries/Session/Session.php                           | 4 ++--
 system/libraries/Session/SessionHandlerInterface.php           | 4 ++--
 system/libraries/Session/Session_driver.php                    | 4 ++--
 system/libraries/Session/drivers/Session_database_driver.php   | 4 ++--
 system/libraries/Session/drivers/Session_files_driver.php      | 4 ++--
 system/libraries/Session/drivers/Session_memcached_driver.php  | 4 ++--
 system/libraries/Session/drivers/Session_redis_driver.php      | 4 ++--
 system/libraries/Table.php                                     | 4 ++--
 system/libraries/Trackback.php                                 | 4 ++--
 system/libraries/Typography.php                                | 4 ++--
 system/libraries/Unit_test.php                                 | 4 ++--
 system/libraries/Upload.php                                    | 4 ++--
 system/libraries/User_agent.php                                | 4 ++--
 system/libraries/Xmlrpc.php                                    | 4 ++--
 system/libraries/Xmlrpcs.php                                   | 4 ++--
 system/libraries/Zip.php                                       | 4 ++--
 user_guide_src/source/conf.py                                  | 4 ++--
 user_guide_src/source/license.rst                              | 2 +-
 176 files changed, 350 insertions(+), 350 deletions(-)

diff --git a/index.php b/index.php
index c27a78ea5..ca1304a8d 100755
--- a/index.php
+++ b/index.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/license.txt b/license.txt
index 934e126ff..dcac58588 100644
--- a/license.txt
+++ b/license.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+Copyright (c) 2014 - 2018, 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
diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
index b3ac79c62..d6e133648 100644
--- a/system/core/Benchmark.php
+++ b/system/core/Benchmark.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index a4c7d5553..82c87b0e2 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Common.php b/system/core/Common.php
index d6a1fdb4e..6d60f239c 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Config.php b/system/core/Config.php
index cda62241b..8136dd24d 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Controller.php b/system/core/Controller.php
index 59a916734..ec9aa2ad0 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php
index 526909602..5a78376a3 100644
--- a/system/core/Exceptions.php
+++ b/system/core/Exceptions.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index f2d6f21ca..82c68b1cc 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Input.php b/system/core/Input.php
index bb287ea4a..143babf5c 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Lang.php b/system/core/Lang.php
index 569b02368..39fdd0668 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 9813e99a9..c84aff35a 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Log.php b/system/core/Log.php
index d443aedb8..a2b464cf7 100644
--- a/system/core/Log.php
+++ b/system/core/Log.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Model.php b/system/core/Model.php
index 8bff9cf91..dd11dd20c 100644
--- a/system/core/Model.php
+++ b/system/core/Model.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Output.php b/system/core/Output.php
index a3155fece..3cda062aa 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Router.php b/system/core/Router.php
index 1abe4c4e5..7b92f70b0 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Security.php b/system/core/Security.php
index 082ffa96b..6cdce5d98 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/URI.php b/system/core/URI.php
index 3ccdfa7b0..574ade69b 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/core/Utf8.php b/system/core/Utf8.php
index dfbbfff2c..7e021776f 100644
--- a/system/core/Utf8.php
+++ b/system/core/Utf8.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0.0
diff --git a/system/core/compat/hash.php b/system/core/compat/hash.php
index c65203aaf..68a812927 100644
--- a/system/core/compat/hash.php
+++ b/system/core/compat/hash.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/core/compat/mbstring.php b/system/core/compat/mbstring.php
index 1b2f2c63b..9f6c24e2e 100644
--- a/system/core/compat/mbstring.php
+++ b/system/core/compat/mbstring.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/core/compat/password.php b/system/core/compat/password.php
index 8176f0088..89a77c475 100644
--- a/system/core/compat/password.php
+++ b/system/core/compat/password.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/core/compat/standard.php b/system/core/compat/standard.php
index 7db2efb57..24f3abcd9 100644
--- a/system/core/compat/standard.php
+++ b/system/core/compat/standard.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/DB.php b/system/database/DB.php
index c19eef72c..f58c2e893 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index 7c8ee5fc9..56b735648 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index c18701db3..059849771 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index f1e0b1419..d3057dc1c 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 72bd4e721..b9bbb5016 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index 40b8fbb74..a5a4ca27d 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 25d842c09..868017687 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/drivers/cubrid/cubrid_driver.php b/system/database/drivers/cubrid/cubrid_driver.php
index 6e8aff7c6..9d6afea6d 100644
--- a/system/database/drivers/cubrid/cubrid_driver.php
+++ b/system/database/drivers/cubrid/cubrid_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.1.0
diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php
index 27bfc1466..95e7ca1d0 100644
--- a/system/database/drivers/cubrid/cubrid_forge.php
+++ b/system/database/drivers/cubrid/cubrid_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.1.0
diff --git a/system/database/drivers/cubrid/cubrid_result.php b/system/database/drivers/cubrid/cubrid_result.php
index 251b70a63..a71b1a20f 100644
--- a/system/database/drivers/cubrid/cubrid_result.php
+++ b/system/database/drivers/cubrid/cubrid_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.1.0
diff --git a/system/database/drivers/cubrid/cubrid_utility.php b/system/database/drivers/cubrid/cubrid_utility.php
index 555ae7a91..eb906ae21 100644
--- a/system/database/drivers/cubrid/cubrid_utility.php
+++ b/system/database/drivers/cubrid/cubrid_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.1.0
diff --git a/system/database/drivers/ibase/ibase_driver.php b/system/database/drivers/ibase/ibase_driver.php
index 3069d6699..fd866ffd1 100644
--- a/system/database/drivers/ibase/ibase_driver.php
+++ b/system/database/drivers/ibase/ibase_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/ibase/ibase_forge.php b/system/database/drivers/ibase/ibase_forge.php
index 31352f128..77aa4ae01 100644
--- a/system/database/drivers/ibase/ibase_forge.php
+++ b/system/database/drivers/ibase/ibase_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/ibase/ibase_result.php b/system/database/drivers/ibase/ibase_result.php
index 7d7dd79ac..b548f32ff 100644
--- a/system/database/drivers/ibase/ibase_result.php
+++ b/system/database/drivers/ibase/ibase_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/ibase/ibase_utility.php b/system/database/drivers/ibase/ibase_utility.php
index 3c152101a..a1e5d69ef 100644
--- a/system/database/drivers/ibase/ibase_utility.php
+++ b/system/database/drivers/ibase/ibase_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index cb89f3b3f..b2b17d0be 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php
index 6b6109868..9a3e3ebcb 100644
--- a/system/database/drivers/mssql/mssql_forge.php
+++ b/system/database/drivers/mssql/mssql_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php
index 38a0a0574..8e1f4164c 100644
--- a/system/database/drivers/mssql/mssql_result.php
+++ b/system/database/drivers/mssql/mssql_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php
index 95ce88f13..90b7107fa 100644
--- a/system/database/drivers/mssql/mssql_utility.php
+++ b/system/database/drivers/mssql/mssql_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 71dad676e..05a3283c8 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php
index 7ed8f8d38..f8a998b56 100644
--- a/system/database/drivers/mysql/mysql_forge.php
+++ b/system/database/drivers/mysql/mysql_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php
index 7aa265ebb..07d518782 100644
--- a/system/database/drivers/mysql/mysql_result.php
+++ b/system/database/drivers/mysql/mysql_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php
index bc01fc58d..ae3c26cba 100644
--- a/system/database/drivers/mysql/mysql_utility.php
+++ b/system/database/drivers/mysql/mysql_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index b59e89494..7cec29e9e 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php
index c5b23b6ca..dd77edca8 100644
--- a/system/database/drivers/mysqli/mysqli_forge.php
+++ b/system/database/drivers/mysqli/mysqli_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php
index bd465c405..bac073781 100644
--- a/system/database/drivers/mysqli/mysqli_result.php
+++ b/system/database/drivers/mysqli/mysqli_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php
index 82cf5cebf..332da604c 100644
--- a/system/database/drivers/mysqli/mysqli_utility.php
+++ b/system/database/drivers/mysqli/mysqli_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index fb2f6b31b..1bd977390 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.4.1
diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php
index 724a76df4..0011bb022 100644
--- a/system/database/drivers/oci8/oci8_forge.php
+++ b/system/database/drivers/oci8/oci8_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.4.1
diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php
index 0c3543333..1c4196f27 100644
--- a/system/database/drivers/oci8/oci8_result.php
+++ b/system/database/drivers/oci8/oci8_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.4.1
diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php
index ce0dfc5f8..574ff6852 100644
--- a/system/database/drivers/oci8/oci8_utility.php
+++ b/system/database/drivers/oci8/oci8_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.4.1
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index ef982fc63..c85390352 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php
index 77b2fdf62..761e81fcd 100644
--- a/system/database/drivers/odbc/odbc_forge.php
+++ b/system/database/drivers/odbc/odbc_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php
index 845aa9c79..f7c3aecbb 100644
--- a/system/database/drivers/odbc/odbc_result.php
+++ b/system/database/drivers/odbc/odbc_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php
index 643f6ec0c..2a3342801 100644
--- a/system/database/drivers/odbc/odbc_utility.php
+++ b/system/database/drivers/odbc/odbc_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
index 6afc999c2..c99bb0603 100644
--- a/system/database/drivers/pdo/pdo_driver.php
+++ b/system/database/drivers/pdo/pdo_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.1.0
diff --git a/system/database/drivers/pdo/pdo_forge.php b/system/database/drivers/pdo/pdo_forge.php
index 685b6776d..c77a84982 100644
--- a/system/database/drivers/pdo/pdo_forge.php
+++ b/system/database/drivers/pdo/pdo_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.1.0
diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php
index bbc2cdc5a..3a821fbdc 100644
--- a/system/database/drivers/pdo/pdo_result.php
+++ b/system/database/drivers/pdo/pdo_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.1.0
diff --git a/system/database/drivers/pdo/pdo_utility.php b/system/database/drivers/pdo/pdo_utility.php
index 5029cac94..9091ea519 100644
--- a/system/database/drivers/pdo/pdo_utility.php
+++ b/system/database/drivers/pdo/pdo_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.1.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php b/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
index 7eaeaa1fd..bbb675d3b 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php
index 3f636d3bd..7135aa169 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php b/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php
index fc49e0dd0..3189aab23 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
index 276cbb6bc..624ce51ac 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
index b9b86f784..d04f8b35b 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php
index d0cca38dd..0216b59c5 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
index cb93f19b7..eec5bf2ee 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php b/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php
index 20c5a6897..2a5fa6470 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php b/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php
index 26b556a78..43400a441 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php b/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php
index 4238ca082..f1bd2c3a7 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php b/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php
index 050171f64..e44dcb805 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php b/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php
index 2ddc2a933..e4202c2bc 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
index 64b13d827..e172145e9 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php
index c7a92b826..629e0a9df 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php b/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php
index abf9167d6..fef7a9a06 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
index 813207b8e..ad2656106 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php b/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php
index 066dd9614..48909885c 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php b/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php
index a2a3bada3..02b6a2ac2 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
index 9aed3a2fe..33c8f1eee 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php
index b00af4ad0..e5bfee6ad 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php b/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
index 9b70f3ea6..93871a99b 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php
index 18c475b17..67fe6ee7e 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
index a9fb4d14a..db1002915 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php
index 82a0d515d..4c9dbe6f9 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index bcdfc060a..7fb258abb 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php
index cdbff4c4b..cf90325e1 100644
--- a/system/database/drivers/postgre/postgre_forge.php
+++ b/system/database/drivers/postgre/postgre_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php
index 57864a7f3..daf3306f3 100644
--- a/system/database/drivers/postgre/postgre_result.php
+++ b/system/database/drivers/postgre/postgre_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php
index 5ca358da5..3af225ff4 100644
--- a/system/database/drivers/postgre/postgre_utility.php
+++ b/system/database/drivers/postgre/postgre_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 03c96e448..a06122984 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php
index a0fc0cdb0..10d5fe6d6 100644
--- a/system/database/drivers/sqlite/sqlite_forge.php
+++ b/system/database/drivers/sqlite/sqlite_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php
index 34d3ac3c1..59516b0d4 100644
--- a/system/database/drivers/sqlite/sqlite_result.php
+++ b/system/database/drivers/sqlite/sqlite_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php
index 90ca4b161..57f685e0f 100644
--- a/system/database/drivers/sqlite/sqlite_utility.php
+++ b/system/database/drivers/sqlite/sqlite_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
diff --git a/system/database/drivers/sqlite3/sqlite3_driver.php b/system/database/drivers/sqlite3/sqlite3_driver.php
index d131baad7..41d9d484f 100644
--- a/system/database/drivers/sqlite3/sqlite3_driver.php
+++ b/system/database/drivers/sqlite3/sqlite3_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/sqlite3/sqlite3_forge.php b/system/database/drivers/sqlite3/sqlite3_forge.php
index 5ee6daae3..48c5efc97 100644
--- a/system/database/drivers/sqlite3/sqlite3_forge.php
+++ b/system/database/drivers/sqlite3/sqlite3_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/sqlite3/sqlite3_result.php b/system/database/drivers/sqlite3/sqlite3_result.php
index 03751f0dc..a143fd7cb 100644
--- a/system/database/drivers/sqlite3/sqlite3_result.php
+++ b/system/database/drivers/sqlite3/sqlite3_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/sqlite3/sqlite3_utility.php b/system/database/drivers/sqlite3/sqlite3_utility.php
index 20d562f96..c829c1fc0 100644
--- a/system/database/drivers/sqlite3/sqlite3_utility.php
+++ b/system/database/drivers/sqlite3/sqlite3_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php
index 4edcc7fb8..05d35a42f 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_driver.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0.3
diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php
index aa8490ee4..01547e802 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_forge.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0.3
diff --git a/system/database/drivers/sqlsrv/sqlsrv_result.php b/system/database/drivers/sqlsrv/sqlsrv_result.php
index f784ebea8..1d0272f9d 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_result.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_result.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0.3
diff --git a/system/database/drivers/sqlsrv/sqlsrv_utility.php b/system/database/drivers/sqlsrv/sqlsrv_utility.php
index 19c93d0c6..001107db9 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_utility.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_utility.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0.3
diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index 74c7c15a8..3d4a496be 100644
--- a/system/helpers/array_helper.php
+++ b/system/helpers/array_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index b1a7eedd0..a67b72bd5 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php
index b943edbae..eccd2f39f 100644
--- a/system/helpers/cookie_helper.php
+++ b/system/helpers/cookie_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index bb1504260..eca1fc021 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php
index 2785241e6..0d3f20572 100644
--- a/system/helpers/directory_helper.php
+++ b/system/helpers/directory_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index b2a1458de..a9bea94e2 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/email_helper.php b/system/helpers/email_helper.php
index b3755d453..f851f72c4 100644
--- a/system/helpers/email_helper.php
+++ b/system/helpers/email_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index d227f4684..90e4c90f6 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 13f196318..87460451d 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 87a5f9b23..5cec4597b 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 4a6805fbb..8354d83fd 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/language_helper.php b/system/helpers/language_helper.php
index d26cf5b8d..f1dc8151d 100644
--- a/system/helpers/language_helper.php
+++ b/system/helpers/language_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/number_helper.php b/system/helpers/number_helper.php
index cc8a7760c..00e645136 100644
--- a/system/helpers/number_helper.php
+++ b/system/helpers/number_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php
index 6896cb97b..697f6bd19 100644
--- a/system/helpers/path_helper.php
+++ b/system/helpers/path_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php
index 5e2970a5c..fb553858f 100644
--- a/system/helpers/security_helper.php
+++ b/system/helpers/security_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php
index 2c9a3b4a6..b7f1d2e1a 100644
--- a/system/helpers/smiley_helper.php
+++ b/system/helpers/smiley_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php
index 93446b82f..3aa92fa8c 100644
--- a/system/helpers/string_helper.php
+++ b/system/helpers/string_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php
index 217729b70..3e2dca8a2 100644
--- a/system/helpers/text_helper.php
+++ b/system/helpers/text_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index 183e117bf..e97c83ba6 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 489f2d44e..0359ac92c 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php
index a12ee25db..68fb9d762 100644
--- a/system/helpers/xml_helper.php
+++ b/system/helpers/xml_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php
index 77911e983..e8d673d10 100644
--- a/system/language/english/calendar_lang.php
+++ b/system/language/english/calendar_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php
index bb454edfb..52bedb587 100644
--- a/system/language/english/date_lang.php
+++ b/system/language/english/date_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php
index b44bda951..d04c4929a 100644
--- a/system/language/english/db_lang.php
+++ b/system/language/english/db_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php
index 22dc0fa78..56589e087 100644
--- a/system/language/english/email_lang.php
+++ b/system/language/english/email_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php
index aa9ff330b..305de3733 100644
--- a/system/language/english/form_validation_lang.php
+++ b/system/language/english/form_validation_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php
index eada3e5d5..534501805 100644
--- a/system/language/english/ftp_lang.php
+++ b/system/language/english/ftp_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php
index 218874cfe..976006e3f 100644
--- a/system/language/english/imglib_lang.php
+++ b/system/language/english/imglib_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/migration_lang.php b/system/language/english/migration_lang.php
index 168496090..68f431b0e 100644
--- a/system/language/english/migration_lang.php
+++ b/system/language/english/migration_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/language/english/number_lang.php b/system/language/english/number_lang.php
index 9723ce5ec..85e58169a 100644
--- a/system/language/english/number_lang.php
+++ b/system/language/english/number_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/pagination_lang.php b/system/language/english/pagination_lang.php
index d24dd047b..7ea444930 100644
--- a/system/language/english/pagination_lang.php
+++ b/system/language/english/pagination_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php
index 20949a20a..f0de6a735 100644
--- a/system/language/english/profiler_lang.php
+++ b/system/language/english/profiler_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/unit_test_lang.php b/system/language/english/unit_test_lang.php
index a89cb2d93..4fccc5f5d 100644
--- a/system/language/english/unit_test_lang.php
+++ b/system/language/english/unit_test_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php
index ec611f9ac..b301c9975 100644
--- a/system/language/english/upload_lang.php
+++ b/system/language/english/upload_lang.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php
index 267dffb09..f13c02402 100644
--- a/system/libraries/Cache/Cache.php
+++ b/system/libraries/Cache/Cache.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0.0
diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php
index c873eb640..b42a832e3 100644
--- a/system/libraries/Cache/drivers/Cache_apc.php
+++ b/system/libraries/Cache/drivers/Cache_apc.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0.0
diff --git a/system/libraries/Cache/drivers/Cache_dummy.php b/system/libraries/Cache/drivers/Cache_dummy.php
index c6d9a61f1..bbaf96fc4 100644
--- a/system/libraries/Cache/drivers/Cache_dummy.php
+++ b/system/libraries/Cache/drivers/Cache_dummy.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0
diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php
index 8a36e9d79..4f383032f 100644
--- a/system/libraries/Cache/drivers/Cache_file.php
+++ b/system/libraries/Cache/drivers/Cache_file.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0
diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php
index ef020f23e..9dfee475f 100644
--- a/system/libraries/Cache/drivers/Cache_memcached.php
+++ b/system/libraries/Cache/drivers/Cache_memcached.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0
diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php
index ac67be077..bfd620436 100644
--- a/system/libraries/Cache/drivers/Cache_redis.php
+++ b/system/libraries/Cache/drivers/Cache_redis.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Cache/drivers/Cache_wincache.php b/system/libraries/Cache/drivers/Cache_wincache.php
index f296a5e26..b4279bb9d 100644
--- a/system/libraries/Cache/drivers/Cache_wincache.php
+++ b/system/libraries/Cache/drivers/Cache_wincache.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index edb0fb4d9..450350ccf 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php
index 734c43420..4c51e7aac 100644
--- a/system/libraries/Cart.php
+++ b/system/libraries/Cart.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php
index 00e8416f9..7dd66ec9c 100644
--- a/system/libraries/Driver.php
+++ b/system/libraries/Driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 8fefcbab9..6a8bda70e 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php
index ebcc6e8c6..17a3fe270 100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Encryption.php b/system/libraries/Encryption.php
index 9a21bae4c..62f8556eb 100644
--- a/system/libraries/Encryption.php
+++ b/system/libraries/Encryption.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 73fb2dab9..3444c65a0 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index 86e5b8f33..2885b550f 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 8786d9d02..b9adcd6e5 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 7648526b4..ec5fe5948 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Javascript/Jquery.php b/system/libraries/Javascript/Jquery.php
index ee5f9dea5..70f9aaccd 100644
--- a/system/libraries/Javascript/Jquery.php
+++ b/system/libraries/Javascript/Jquery.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index 2a87d9d7c..2c4f34abc 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 3af70cb12..3fe3d3a45 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php
index fdd958b22..1534e4d9d 100644
--- a/system/libraries/Parser.php
+++ b/system/libraries/Parser.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index cb3eaed75..3294cdfa2 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index bf22227d8..9e762745f 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0.0
diff --git a/system/libraries/Session/SessionHandlerInterface.php b/system/libraries/Session/SessionHandlerInterface.php
index 2eef61db8..db0bc7d3a 100644
--- a/system/libraries/Session/SessionHandlerInterface.php
+++ b/system/libraries/Session/SessionHandlerInterface.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php
index f32f14ae0..bef5ee41f 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 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Session/drivers/Session_database_driver.php b/system/libraries/Session/drivers/Session_database_driver.php
index b519b782f..ae7a1b4a1 100644
--- a/system/libraries/Session/drivers/Session_database_driver.php
+++ b/system/libraries/Session/drivers/Session_database_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Session/drivers/Session_files_driver.php b/system/libraries/Session/drivers/Session_files_driver.php
index 8860ef667..c6d789aae 100644
--- a/system/libraries/Session/drivers/Session_files_driver.php
+++ b/system/libraries/Session/drivers/Session_files_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php
index 5e90539d7..edabff52c 100644
--- a/system/libraries/Session/drivers/Session_memcached_driver.php
+++ b/system/libraries/Session/drivers/Session_memcached_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Session/drivers/Session_redis_driver.php b/system/libraries/Session/drivers/Session_redis_driver.php
index a9e655a8c..413c30d67 100644
--- a/system/libraries/Session/drivers/Session_redis_driver.php
+++ b/system/libraries/Session/drivers/Session_redis_driver.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 3.0.0
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 50c5e358b..36da513d4 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.1
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php
index 55e9a0ee6..228794dd7 100644
--- a/system/libraries/Trackback.php
+++ b/system/libraries/Trackback.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index b25d8fdaa..bfc993472 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index 38e0fbd24..fa87e03b9 100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.1
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 3b450c561..8e6bdfa67 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index cda3ef0a0..b1a011f19 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index 6fa791864..39e4dd37e 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index 7f760a088..4680bbfa4 100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 2c71e1fbe..f8f95fe12 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2018, 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,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index e2b1c2972..a3d758ee8 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'CodeIgniter'
-copyright = u'2014 - 2017, British Columbia Institute of Technology'
+copyright = u'2014 - 2018, British Columbia Institute of Technology'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -229,7 +229,7 @@ man_pages = [
 epub_title = u'CodeIgniter'
 epub_author = u'British Columbia Institute of Technology'
 epub_publisher = u'British Columbia Institute of Technology'
-epub_copyright = u'2014 - 2017, British Columbia Institute of Technology'
+epub_copyright = u'2014 - 2018, British Columbia Institute of Technology'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
diff --git a/user_guide_src/source/license.rst b/user_guide_src/source/license.rst
index c943c294a..d65b56431 100644
--- a/user_guide_src/source/license.rst
+++ b/user_guide_src/source/license.rst
@@ -2,7 +2,7 @@
 The MIT License (MIT)
 #####################
 
-Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+Copyright (c) 2014 - 2018, 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
-- 
cgit v1.2.3-24-g4f1b


From 615f3d9ddd01e2023016b5e72ba9efac6ee1b107 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 12 Jan 2018 12:33:44 +0200
Subject: [ci skip] Merge pull request #5379 from
 tianhe1986/develop_session_memcached

Fix of Session_memcached_driver::_get_lock
---
 system/libraries/Session/drivers/Session_memcached_driver.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php
index edabff52c..b109738c2 100644
--- a/system/libraries/Session/drivers/Session_memcached_driver.php
+++ b/system/libraries/Session/drivers/Session_memcached_driver.php
@@ -313,6 +313,8 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa
 					? $this->_memcached->add($this->_lock_key, time(), 300)
 					: FALSE;
 			}
+
+			return TRUE;
 		}
 
 		// 30 attempts to obtain a lock, in case another request already has it
-- 
cgit v1.2.3-24-g4f1b


From 3185447a82a808e9c85c79b6ce12bcb7358c8de0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 12 Jan 2018 12:39:29 +0200
Subject: [ci skip] Add changelog entry for PR #5379

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 619fa4651..c316da83f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -26,6 +26,7 @@ Bug fixes for 3.1.7
 -  Fixed a bug (#5279) - :doc:`Query Builder ` didn't account for already escaped identifiers while applying database name prefixes.
 -  Fixed a bug (#5331) - :doc:`URL Helper ` function :php:func:`auto_link()` converted e-mail addresses starting with 'www.' to both "url" and "email" links.
 -  Fixed a bug where ``$config['allow_get_array']`` defaulted to ``FALSE`` if it didn't exist in the config file.
+-  Fixed a bug (#5379) - :doc:`Session Library ` would incorrectly fail to obtain a lock that it already has on PHP 7 with the 'memcached' driver.
 
 Version 3.1.6
 =============
-- 
cgit v1.2.3-24-g4f1b


From f0b9735d5857e6c07c8f5824b13cff4828db3cfe Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 13 Jan 2018 13:54:38 +0200
Subject: [ci skip] Prepare 3.1.7 release

---
 system/core/CodeIgniter.php                      | 2 +-
 user_guide_src/source/changelog.rst              | 2 +-
 user_guide_src/source/conf.py                    | 4 ++--
 user_guide_src/source/installation/downloads.rst | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 82c87b0e2..962196b6b 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.7-dev';
+	const CI_VERSION = '3.1.7';
 
 /*
  * ------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c316da83f..e23517a86 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -5,7 +5,7 @@ Change Log
 Version 3.1.7
 =============
 
-Release Date: Not Released
+Release Date: Jan 13, 2018
 
 -  General Changes
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index a3d758ee8..fbd81c47e 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014 - 2018, British Columbia Institute of Technology'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.7-dev'
+version = '3.1.7'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.7-dev'
+release = '3.1.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst
index 34e654078..85f5ecf5f 100644
--- a/user_guide_src/source/installation/downloads.rst
+++ b/user_guide_src/source/installation/downloads.rst
@@ -2,7 +2,7 @@
 Downloading CodeIgniter
 #######################
 
--  `CodeIgniter v3.1.7-dev (Current version) `_
+-  `CodeIgniter v3.1.7 (Current version) `_
 -  `CodeIgniter v3.1.6 `_
 -  `CodeIgniter v3.1.5 `_
 -  `CodeIgniter v3.1.4 `_
-- 
cgit v1.2.3-24-g4f1b


From 02a0518e1c56ba3506f370362ac5ebdb8a138312 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 13 Jan 2018 13:57:11 +0200
Subject: [ci skip] 3.1.7 release

---
 .travis.yml                                        |    57 -
 DCO.txt                                            |    25 -
 build-release.sh                                   |    99 -
 phpdoc.dist.xml                                    |    21 -
 tests/Bootstrap.php                                |    76 -
 tests/README.md                                    |   226 -
 tests/codeigniter/Setup_test.php                   |    13 -
 tests/codeigniter/core/Benchmark_test.php          |    67 -
 tests/codeigniter/core/Common_test.php             |    69 -
 tests/codeigniter/core/Config_test.php             |   240 -
 tests/codeigniter/core/Input_test.php              |   281 -
 tests/codeigniter/core/Lang_test.php               |   101 -
 tests/codeigniter/core/Loader_test.php             |   583 --
 tests/codeigniter/core/Log_test.php                |    63 -
 tests/codeigniter/core/Model_test.php              |    37 -
 tests/codeigniter/core/Output_test.php             |    63 -
 tests/codeigniter/core/Security_test.php           |   353 -
 tests/codeigniter/core/URI_test.php                |   254 -
 tests/codeigniter/core/Utf8_test.php               |    91 -
 tests/codeigniter/core/compat/hash_test.php        |    77 -
 tests/codeigniter/core/compat/mbstring_test.php    |    54 -
 tests/codeigniter/core/compat/password_test.php    |   159 -
 tests/codeigniter/core/compat/standard_test.php    |   378 -
 tests/codeigniter/database/DB_driver_test.php      |    39 -
 tests/codeigniter/database/DB_test.php             |    61 -
 .../database/query_builder/count_test.php          |    48 -
 .../database/query_builder/delete_test.php         |    64 -
 .../database/query_builder/distinct_test.php       |    33 -
 .../database/query_builder/empty_test.php          |    39 -
 .../database/query_builder/escape_test.php         |    68 -
 .../database/query_builder/from_test.php           |    49 -
 .../database/query_builder/get_test.php            |    53 -
 .../database/query_builder/group_test.php          |    50 -
 .../database/query_builder/insert_test.php         |    66 -
 .../database/query_builder/join_test.php           |   101 -
 .../database/query_builder/like_test.php           |   106 -
 .../database/query_builder/limit_test.php          |    48 -
 .../database/query_builder/order_test.php          |    55 -
 .../database/query_builder/select_test.php         |    95 -
 .../database/query_builder/truncate_test.php       |    56 -
 .../database/query_builder/update_test.php         |    57 -
 .../database/query_builder/where_test.php          |   134 -
 tests/codeigniter/helpers/array_helper_test.php    |    45 -
 tests/codeigniter/helpers/captcha_helper_test.php  |    10 -
 tests/codeigniter/helpers/cookie_helper_test.php   |    59 -
 tests/codeigniter/helpers/date_helper_test.php     |   325 -
 .../codeigniter/helpers/directory_helper_test.php  |    59 -
 tests/codeigniter/helpers/download_helper_test.php |    10 -
 tests/codeigniter/helpers/email_helper_test.php    |    24 -
 tests/codeigniter/helpers/file_helper_test.php     |   147 -
 tests/codeigniter/helpers/form_helper_test.php     |   290 -
 tests/codeigniter/helpers/html_helper_test.php     |   106 -
 .../codeigniter/helpers/inflector_helper_test.php  |    96 -
 tests/codeigniter/helpers/language_helper_test.php |    16 -
 tests/codeigniter/helpers/number_helper_test.php   |    63 -
 tests/codeigniter/helpers/path_helper_test.php     |    30 -
 tests/codeigniter/helpers/security_helper_test.php |    64 -
 tests/codeigniter/helpers/string_helper_test.php   |   148 -
 tests/codeigniter/helpers/text_helper_test.php     |   174 -
 tests/codeigniter/helpers/url_helper_test.php      |    89 -
 tests/codeigniter/helpers/xml_helper_test.php      |    15 -
 tests/codeigniter/libraries/Calendar_test.php      |   222 -
 tests/codeigniter/libraries/Driver_test.php        |   178 -
 tests/codeigniter/libraries/Encrypt_test.php       |    79 -
 tests/codeigniter/libraries/Encryption_test.php    |   400 -
 .../codeigniter/libraries/Form_validation_test.php |   626 --
 tests/codeigniter/libraries/Parser_test.php        |    95 -
 tests/codeigniter/libraries/Session_test.php       |   440 -
 tests/codeigniter/libraries/Table_test.php         |   300 -
 tests/codeigniter/libraries/Typography_test.php    |   182 -
 tests/codeigniter/libraries/Upload_test.php        |   299 -
 tests/codeigniter/libraries/Useragent_test.php     |   125 -
 tests/mocks/autoloader.php                         |   119 -
 tests/mocks/ci_testcase.php                        |   384 -
 tests/mocks/ci_testconfig.php                      |    20 -
 tests/mocks/core/common.php                        |   153 -
 tests/mocks/core/input.php                         |    49 -
 tests/mocks/core/security.php                      |    35 -
 tests/mocks/core/uri.php                           |    32 -
 tests/mocks/core/utf8.php                          |    19 -
 tests/mocks/database/ci_test.sqlite                |   Bin 19456 -> 0 bytes
 tests/mocks/database/config/mysql.php              |    34 -
 tests/mocks/database/config/mysqli.php             |    34 -
 tests/mocks/database/config/pdo/mysql.php          |    37 -
 tests/mocks/database/config/pdo/pgsql.php          |    37 -
 tests/mocks/database/config/pdo/sqlite.php         |    37 -
 tests/mocks/database/config/pgsql.php              |    34 -
 tests/mocks/database/config/sqlite.php             |    34 -
 tests/mocks/database/db.php                        |   142 -
 tests/mocks/database/db/driver.php                 |    40 -
 tests/mocks/database/drivers/mysql.php             |    16 -
 tests/mocks/database/drivers/mysqli.php            |    16 -
 tests/mocks/database/drivers/pdo.php               |    15 -
 tests/mocks/database/drivers/postgre.php           |    16 -
 tests/mocks/database/drivers/sqlite.php            |    16 -
 tests/mocks/database/schema/skeleton.php           |   155 -
 tests/mocks/libraries/driver.php                   |    27 -
 tests/mocks/libraries/encrypt.php                  |    16 -
 tests/mocks/libraries/encryption.php               |    39 -
 tests/mocks/libraries/session.php                  |    38 -
 tests/mocks/libraries/table.php                    |    16 -
 tests/mocks/uploads/ci_logo.gif                    |   Bin 3270 -> 0 bytes
 tests/phpunit.xml                                  |    24 -
 tests/travis/mysql.phpunit.xml                     |    25 -
 tests/travis/mysqli.phpunit.xml                    |    25 -
 tests/travis/pdo/mysql.phpunit.xml                 |    25 -
 tests/travis/pdo/pgsql.phpunit.xml                 |    25 -
 tests/travis/pdo/sqlite.phpunit.xml                |    25 -
 tests/travis/pgsql.phpunit.xml                     |    25 -
 tests/travis/sqlite.phpunit.xml                    |    25 -
 user_guide/.buildinfo                              |     4 +
 user_guide/DCO.html                                |   517 +
 user_guide/_downloads/ELDocs.tmbundle.zip          |   Bin 0 -> 3932 bytes
 user_guide/_images/appflowchart.gif                |   Bin 0 -> 25276 bytes
 user_guide/_images/smile.gif                       |   Bin 0 -> 1156 bytes
 user_guide/_static/ajax-loader.gif                 |   Bin 0 -> 673 bytes
 user_guide/_static/basic.css                       |   639 ++
 user_guide/_static/ci-icon.ico                     |   Bin 0 -> 5430 bytes
 user_guide/_static/comment-bright.png              |   Bin 0 -> 756 bytes
 user_guide/_static/comment-close.png               |   Bin 0 -> 829 bytes
 user_guide/_static/comment.png                     |   Bin 0 -> 641 bytes
 user_guide/_static/css/badge_only.css              |     2 +
 user_guide/_static/css/citheme.css                 |    88 +
 user_guide/_static/css/theme.css                   |     5 +
 user_guide/_static/doctools.js                     |   287 +
 user_guide/_static/down-pressed.png                |   Bin 0 -> 222 bytes
 user_guide/_static/down.png                        |   Bin 0 -> 202 bytes
 user_guide/_static/file.png                        |   Bin 0 -> 286 bytes
 user_guide/_static/fonts/FontAwesome.otf           |   Bin 0 -> 62856 bytes
 user_guide/_static/fonts/fontawesome-webfont.eot   |   Bin 0 -> 38205 bytes
 user_guide/_static/fonts/fontawesome-webfont.svg   |   414 +
 user_guide/_static/fonts/fontawesome-webfont.ttf   |   Bin 0 -> 80652 bytes
 user_guide/_static/fonts/fontawesome-webfont.woff  |   Bin 0 -> 44432 bytes
 user_guide/_static/images/ci-icon.ico              |   Bin 0 -> 1150 bytes
 user_guide/_static/jquery-3.1.0.js                 | 10074 +++++++++++++++++++
 user_guide/_static/jquery.js                       |     4 +
 user_guide/_static/js/oldtheme.js                  |    47 +
 user_guide/_static/js/theme.js                     |   131 +
 user_guide/_static/minus.png                       |   Bin 0 -> 90 bytes
 user_guide/_static/plus.png                        |   Bin 0 -> 90 bytes
 user_guide/_static/pygments.css                    |    63 +
 user_guide/_static/searchtools.js                  |   758 ++
 user_guide/_static/underscore-1.3.1.js             |   999 ++
 user_guide/_static/underscore.js                   |    31 +
 user_guide/_static/up-pressed.png                  |   Bin 0 -> 214 bytes
 user_guide/_static/up.png                          |   Bin 0 -> 203 bytes
 user_guide/_static/websupport.js                   |   808 ++
 user_guide/changelog.html                          |  4151 ++++++++
 user_guide/contributing/index.html                 |   615 ++
 user_guide/database/caching.html                   |   642 ++
 user_guide/database/call_function.html             |   529 +
 user_guide/database/configuration.html             |   758 ++
 user_guide/database/connecting.html                |   641 ++
 user_guide/database/db_driver_reference.html       |  1483 +++
 user_guide/database/examples.html                  |   597 ++
 user_guide/database/forge.html                     |  1034 ++
 user_guide/database/helpers.html                   |   592 ++
 user_guide/database/index.html                     |   514 +
 user_guide/database/metadata.html                  |   614 ++
 user_guide/database/queries.html                   |   658 ++
 user_guide/database/query_builder.html             |  2714 +++++
 user_guide/database/results.html                   |  1231 +++
 user_guide/database/transactions.html              |   615 ++
 user_guide/database/utilities.html                 |   993 ++
 user_guide/documentation/index.html                |   702 ++
 user_guide/general/alternative_php.html            |   566 ++
 user_guide/general/ancillary_classes.html          |   578 ++
 user_guide/general/autoloader.html                 |   519 +
 user_guide/general/caching.html                    |   563 ++
 user_guide/general/cli.html                        |   573 ++
 user_guide/general/common_functions.html           |   776 ++
 user_guide/general/compatibility_functions.html    |   914 ++
 user_guide/general/controllers.html                |   845 ++
 user_guide/general/core_classes.html               |   607 ++
 user_guide/general/creating_drivers.html           |   524 +
 user_guide/general/creating_libraries.html         |   754 ++
 user_guide/general/credits.html                    |   502 +
 user_guide/general/drivers.html                    |   530 +
 user_guide/general/environments.html               |   538 +
 user_guide/general/errors.html                     |   649 ++
 user_guide/general/helpers.html                    |   629 ++
 user_guide/general/hooks.html                      |   617 ++
 user_guide/general/index.html                      |   523 +
 user_guide/general/libraries.html                  |   521 +
 user_guide/general/managing_apps.html              |   554 +
 user_guide/general/models.html                     |   673 ++
 user_guide/general/profiling.html                  |   624 ++
 user_guide/general/requirements.html               |   511 +
 user_guide/general/reserved_names.html             |   583 ++
 user_guide/general/routing.html                    |   689 ++
 user_guide/general/security.html                   |   663 ++
 user_guide/general/styleguide.html                 |  1128 +++
 user_guide/general/urls.html                       |   597 ++
 user_guide/general/views.html                      |   704 ++
 user_guide/general/welcome.html                    |   520 +
 user_guide/genindex.html                           |  1935 ++++
 user_guide/helpers/array_helper.html               |   660 ++
 user_guide/helpers/captcha_helper.html             |   676 ++
 user_guide/helpers/cookie_helper.html              |   608 ++
 user_guide/helpers/date_helper.html                |  1256 +++
 user_guide/helpers/directory_helper.html           |   587 ++
 user_guide/helpers/download_helper.html            |   556 +
 user_guide/helpers/email_helper.html               |   598 ++
 user_guide/helpers/file_helper.html                |   829 ++
 user_guide/helpers/form_helper.html                |  1598 +++
 user_guide/helpers/html_helper.html                |  1091 ++
 user_guide/helpers/index.html                      |   518 +
 user_guide/helpers/inflector_helper.html           |   680 ++
 user_guide/helpers/language_helper.html            |   550 +
 user_guide/helpers/number_helper.html              |   559 +
 user_guide/helpers/path_helper.html                |   557 +
 user_guide/helpers/security_helper.html            |   669 ++
 user_guide/helpers/smiley_helper.html              |   708 ++
 user_guide/helpers/string_helper.html              |   873 ++
 user_guide/helpers/text_helper.html                |   847 ++
 user_guide/helpers/typography_helper.html          |   607 ++
 user_guide/helpers/url_helper.html                 |  1044 ++
 user_guide/helpers/xml_helper.html                 |   559 +
 user_guide/index.html                              |   712 ++
 user_guide/installation/downloads.html             |   534 +
 user_guide/installation/index.html                 |   532 +
 user_guide/installation/troubleshooting.html       |   511 +
 user_guide/installation/upgrade_120.html           |   516 +
 user_guide/installation/upgrade_130.html           |   619 ++
 user_guide/installation/upgrade_131.html           |   527 +
 user_guide/installation/upgrade_132.html           |   525 +
 user_guide/installation/upgrade_133.html           |   539 +
 user_guide/installation/upgrade_140.html           |   567 ++
 user_guide/installation/upgrade_141.html           |   564 ++
 user_guide/installation/upgrade_150.html           |   591 ++
 user_guide/installation/upgrade_152.html           |   536 +
 user_guide/installation/upgrade_153.html           |   523 +
 user_guide/installation/upgrade_154.html           |   547 +
 user_guide/installation/upgrade_160.html           |   566 ++
 user_guide/installation/upgrade_161.html           |   522 +
 user_guide/installation/upgrade_162.html           |   537 +
 user_guide/installation/upgrade_163.html           |   522 +
 user_guide/installation/upgrade_170.html           |   549 +
 user_guide/installation/upgrade_171.html           |   522 +
 user_guide/installation/upgrade_172.html           |   539 +
 user_guide/installation/upgrade_200.html           |   632 ++
 user_guide/installation/upgrade_201.html           |   532 +
 user_guide/installation/upgrade_202.html           |   525 +
 user_guide/installation/upgrade_203.html           |   555 +
 user_guide/installation/upgrade_210.html           |   519 +
 user_guide/installation/upgrade_211.html           |   523 +
 user_guide/installation/upgrade_212.html           |   514 +
 user_guide/installation/upgrade_213.html           |   514 +
 user_guide/installation/upgrade_214.html           |   509 +
 user_guide/installation/upgrade_220.html           |   518 +
 user_guide/installation/upgrade_221.html           |   509 +
 user_guide/installation/upgrade_222.html           |   509 +
 user_guide/installation/upgrade_223.html           |   509 +
 user_guide/installation/upgrade_300.html           |  1330 +++
 user_guide/installation/upgrade_301.html           |   513 +
 user_guide/installation/upgrade_302.html           |   520 +
 user_guide/installation/upgrade_303.html           |   547 +
 user_guide/installation/upgrade_304.html           |   509 +
 user_guide/installation/upgrade_305.html           |   509 +
 user_guide/installation/upgrade_306.html           |   539 +
 user_guide/installation/upgrade_310.html           |   527 +
 user_guide/installation/upgrade_311.html           |   509 +
 user_guide/installation/upgrade_312.html           |   534 +
 user_guide/installation/upgrade_313.html           |   539 +
 user_guide/installation/upgrade_314.html           |   509 +
 user_guide/installation/upgrade_315.html           |   509 +
 user_guide/installation/upgrade_316.html           |   523 +
 user_guide/installation/upgrade_317.html           |   522 +
 user_guide/installation/upgrade_b11.html           |   567 ++
 user_guide/installation/upgrading.html             |   549 +
 user_guide/libraries/benchmark.html                |   703 ++
 user_guide/libraries/caching.html                  |   895 ++
 user_guide/libraries/calendar.html                 |   972 ++
 user_guide/libraries/cart.html                     |  1025 ++
 user_guide/libraries/config.html                   |   834 ++
 user_guide/libraries/email.html                    |  1218 +++
 user_guide/libraries/encrypt.html                  |   787 ++
 user_guide/libraries/encryption.html               |  1405 +++
 user_guide/libraries/file_uploading.html           |  1025 ++
 user_guide/libraries/form_validation.html          |  1932 ++++
 user_guide/libraries/ftp.html                      |  1016 ++
 user_guide/libraries/image_lib.html                |  1255 +++
 user_guide/libraries/index.html                    |   527 +
 user_guide/libraries/input.html                    |  1191 +++
 user_guide/libraries/javascript.html               |   802 ++
 user_guide/libraries/language.html                 |   733 ++
 user_guide/libraries/loader.html                   |  1213 +++
 user_guide/libraries/migration.html                |   758 ++
 user_guide/libraries/output.html                   |   912 ++
 user_guide/libraries/pagination.html               |   784 ++
 user_guide/libraries/parser.html                   |   850 ++
 user_guide/libraries/security.html                 |   739 ++
 user_guide/libraries/sessions.html                 |  1922 ++++
 user_guide/libraries/table.html                    |   911 ++
 user_guide/libraries/trackback.html                |  1035 ++
 user_guide/libraries/typography.html               |   657 ++
 user_guide/libraries/unit_testing.html             |   846 ++
 user_guide/libraries/uri.html                      |   890 ++
 user_guide/libraries/user_agent.html               |   931 ++
 user_guide/libraries/xmlrpc.html                   |  1151 +++
 user_guide/libraries/zip.html                      |   846 ++
 user_guide/license.html                            |   509 +
 user_guide/objects.inv                             |   Bin 0 -> 7321 bytes
 user_guide/overview/appflow.html                   |   513 +
 user_guide/overview/at_a_glance.html               |   599 ++
 user_guide/overview/features.html                  |   538 +
 user_guide/overview/getting_started.html           |   512 +
 user_guide/overview/goals.html                     |   522 +
 user_guide/overview/index.html                     |   504 +
 user_guide/overview/mvc.html                       |   519 +
 user_guide/search.html                             |   499 +
 user_guide/searchindex.js                          |     1 +
 user_guide/tutorial/conclusion.html                |   515 +
 user_guide/tutorial/create_news_items.html         |   629 ++
 user_guide/tutorial/index.html                     |   525 +
 user_guide/tutorial/news_section.html              |   685 ++
 user_guide/tutorial/static_pages.html              |   633 ++
 user_guide_src/Makefile                            |   130 -
 user_guide_src/README.rst                          |    65 -
 user_guide_src/cilexer/README                      |    22 -
 user_guide_src/cilexer/cilexer/__init__.py         |     1 -
 user_guide_src/cilexer/cilexer/cilexer.py          |    56 -
 user_guide_src/cilexer/setup.py                    |    23 -
 user_guide_src/source/DCO.rst                      |    27 -
 .../source/_themes/sphinx_rtd_theme/LICENSE        |    20 -
 .../source/_themes/sphinx_rtd_theme/__init__.py    |    17 -
 .../_themes/sphinx_rtd_theme/breadcrumbs.html      |    22 -
 .../source/_themes/sphinx_rtd_theme/footer.html    |    33 -
 .../source/_themes/sphinx_rtd_theme/layout.html    |   166 -
 .../_themes/sphinx_rtd_theme/layout_old.html       |   205 -
 .../source/_themes/sphinx_rtd_theme/pulldown.html  |    17 -
 .../source/_themes/sphinx_rtd_theme/search.html    |    50 -
 .../source/_themes/sphinx_rtd_theme/searchbox.html |     9 -
 .../sphinx_rtd_theme/static/css/badge_only.css     |     2 -
 .../sphinx_rtd_theme/static/css/citheme.css        |    88 -
 .../_themes/sphinx_rtd_theme/static/css/theme.css  |     5 -
 .../sphinx_rtd_theme/static/fonts/FontAwesome.otf  |   Bin 62856 -> 0 bytes
 .../static/fonts/fontawesome-webfont.eot           |   Bin 38205 -> 0 bytes
 .../static/fonts/fontawesome-webfont.svg           |   414 -
 .../static/fonts/fontawesome-webfont.ttf           |   Bin 80652 -> 0 bytes
 .../static/fonts/fontawesome-webfont.woff          |   Bin 44432 -> 0 bytes
 .../sphinx_rtd_theme/static/images/ci-icon.ico     |   Bin 1150 -> 0 bytes
 .../_themes/sphinx_rtd_theme/static/js/oldtheme.js |    47 -
 .../_themes/sphinx_rtd_theme/static/js/theme.js    |   131 -
 .../source/_themes/sphinx_rtd_theme/theme.conf     |     8 -
 .../source/_themes/sphinx_rtd_theme/versions.html  |    37 -
 user_guide_src/source/changelog.rst                |  3597 -------
 user_guide_src/source/conf.py                      |   263 -
 user_guide_src/source/contributing/index.rst       |   159 -
 user_guide_src/source/database/caching.rst         |   162 -
 user_guide_src/source/database/call_function.rst   |    39 -
 user_guide_src/source/database/configuration.rst   |   207 -
 user_guide_src/source/database/connecting.rst      |   155 -
 .../source/database/db_driver_reference.rst        |   439 -
 user_guide_src/source/database/examples.rst        |   119 -
 user_guide_src/source/database/forge.rst           |   412 -
 user_guide_src/source/database/helpers.rst         |   100 -
 user_guide_src/source/database/index.rst           |    25 -
 user_guide_src/source/database/metadata.rst        |   130 -
 user_guide_src/source/database/queries.rst         |   176 -
 user_guide_src/source/database/query_builder.rst   |  1570 ---
 user_guide_src/source/database/results.rst         |   507 -
 user_guide_src/source/database/transactions.rst    |   127 -
 user_guide_src/source/database/utilities.rst       |   316 -
 .../source/documentation/ELDocs.tmbundle.zip       |   Bin 3932 -> 0 bytes
 user_guide_src/source/documentation/index.rst      |   202 -
 user_guide_src/source/general/alternative_php.rst  |    75 -
 .../source/general/ancillary_classes.rst           |    80 -
 user_guide_src/source/general/autoloader.rst       |    27 -
 user_guide_src/source/general/caching.rst          |    71 -
 user_guide_src/source/general/cli.rst              |    78 -
 user_guide_src/source/general/common_functions.rst |   188 -
 .../source/general/compatibility_functions.rst     |   232 -
 user_guide_src/source/general/controllers.rst      |   340 -
 user_guide_src/source/general/core_classes.rst     |   117 -
 user_guide_src/source/general/creating_drivers.rst |    25 -
 .../source/general/creating_libraries.rst          |   260 -
 user_guide_src/source/general/credits.rst          |    22 -
 user_guide_src/source/general/drivers.rst          |    40 -
 user_guide_src/source/general/environments.rst     |    52 -
 user_guide_src/source/general/errors.rst           |   120 -
 user_guide_src/source/general/helpers.rst          |   145 -
 user_guide_src/source/general/hooks.rst            |   127 -
 user_guide_src/source/general/index.rst            |    33 -
 user_guide_src/source/general/libraries.rst        |    32 -
 user_guide_src/source/general/managing_apps.rst    |    61 -
 user_guide_src/source/general/models.rst           |   167 -
 user_guide_src/source/general/profiling.rst        |    90 -
 user_guide_src/source/general/requirements.rst     |    21 -
 user_guide_src/source/general/reserved_names.rst   |    88 -
 user_guide_src/source/general/routing.rst          |   207 -
 user_guide_src/source/general/security.rst         |   200 -
 user_guide_src/source/general/styleguide.rst       |   636 --
 user_guide_src/source/general/urls.rst             |   100 -
 user_guide_src/source/general/views.rst            |   213 -
 user_guide_src/source/general/welcome.rst          |    32 -
 user_guide_src/source/helpers/array_helper.rst     |   133 -
 user_guide_src/source/helpers/captcha_helper.rst   |   168 -
 user_guide_src/source/helpers/cookie_helper.rst    |    79 -
 user_guide_src/source/helpers/date_helper.rst      |   440 -
 user_guide_src/source/helpers/directory_helper.rst |    83 -
 user_guide_src/source/helpers/download_helper.rst  |    56 -
 user_guide_src/source/helpers/email_helper.rst     |    75 -
 user_guide_src/source/helpers/file_helper.rst      |   202 -
 user_guide_src/source/helpers/form_helper.rst      |   743 --
 user_guide_src/source/helpers/html_helper.rst      |   407 -
 user_guide_src/source/helpers/index.rst            |     9 -
 user_guide_src/source/helpers/inflector_helper.rst |    96 -
 user_guide_src/source/helpers/language_helper.rst  |    46 -
 user_guide_src/source/helpers/number_helper.rst    |    52 -
 user_guide_src/source/helpers/path_helper.rst      |    53 -
 user_guide_src/source/helpers/security_helper.rst  |   106 -
 user_guide_src/source/helpers/smiley_helper.rst    |   169 -
 user_guide_src/source/helpers/string_helper.rst    |   223 -
 user_guide_src/source/helpers/text_helper.rst      |   230 -
 .../source/helpers/typography_helper.rst           |    75 -
 user_guide_src/source/helpers/url_helper.rst       |   373 -
 user_guide_src/source/helpers/xml_helper.rst       |    55 -
 user_guide_src/source/images/appflowchart.gif      |   Bin 25276 -> 0 bytes
 user_guide_src/source/images/arrow.gif             |   Bin 123 -> 0 bytes
 user_guide_src/source/images/ci-icon.ico           |   Bin 5430 -> 0 bytes
 user_guide_src/source/images/ci_logo.jpg           |   Bin 5602 -> 0 bytes
 user_guide_src/source/images/ci_logo_flame.jpg     |   Bin 8589 -> 0 bytes
 user_guide_src/source/images/file.gif              |   Bin 370 -> 0 bytes
 user_guide_src/source/images/folder.gif            |   Bin 570 -> 0 bytes
 user_guide_src/source/images/smile.gif             |   Bin 1156 -> 0 bytes
 user_guide_src/source/index.rst                    |   122 -
 user_guide_src/source/installation/downloads.rst   |    44 -
 user_guide_src/source/installation/index.rst       |    57 -
 .../source/installation/troubleshooting.rst        |    18 -
 user_guide_src/source/installation/upgrade_120.rst |    20 -
 user_guide_src/source/installation/upgrade_130.rst |   125 -
 user_guide_src/source/installation/upgrade_131.rst |    30 -
 user_guide_src/source/installation/upgrade_132.rst |    28 -
 user_guide_src/source/installation/upgrade_133.rst |    44 -
 user_guide_src/source/installation/upgrade_140.rst |    72 -
 user_guide_src/source/installation/upgrade_141.rst |    71 -
 user_guide_src/source/installation/upgrade_150.rst |   100 -
 user_guide_src/source/installation/upgrade_152.rst |    39 -
 user_guide_src/source/installation/upgrade_153.rst |    28 -
 user_guide_src/source/installation/upgrade_154.rst |    56 -
 user_guide_src/source/installation/upgrade_160.rst |    87 -
 user_guide_src/source/installation/upgrade_161.rst |    27 -
 user_guide_src/source/installation/upgrade_162.rst |    45 -
 user_guide_src/source/installation/upgrade_163.rst |    27 -
 user_guide_src/source/installation/upgrade_170.rst |    56 -
 user_guide_src/source/installation/upgrade_171.rst |    27 -
 user_guide_src/source/installation/upgrade_172.rst |    48 -
 user_guide_src/source/installation/upgrade_200.rst |   148 -
 user_guide_src/source/installation/upgrade_201.rst |    39 -
 user_guide_src/source/installation/upgrade_202.rst |    33 -
 user_guide_src/source/installation/upgrade_203.rst |    63 -
 user_guide_src/source/installation/upgrade_210.rst |    26 -
 user_guide_src/source/installation/upgrade_211.rst |    31 -
 user_guide_src/source/installation/upgrade_212.rst |    20 -
 user_guide_src/source/installation/upgrade_213.rst |    20 -
 user_guide_src/source/installation/upgrade_214.rst |    14 -
 user_guide_src/source/installation/upgrade_220.rst |    21 -
 user_guide_src/source/installation/upgrade_221.rst |    14 -
 user_guide_src/source/installation/upgrade_222.rst |    14 -
 user_guide_src/source/installation/upgrade_223.rst |    14 -
 user_guide_src/source/installation/upgrade_300.rst |   891 --
 user_guide_src/source/installation/upgrade_301.rst |    19 -
 user_guide_src/source/installation/upgrade_302.rst |    24 -
 user_guide_src/source/installation/upgrade_303.rst |    55 -
 user_guide_src/source/installation/upgrade_304.rst |    14 -
 user_guide_src/source/installation/upgrade_305.rst |    14 -
 user_guide_src/source/installation/upgrade_306.rst |    48 -
 user_guide_src/source/installation/upgrade_310.rst |    38 -
 user_guide_src/source/installation/upgrade_311.rst |    14 -
 user_guide_src/source/installation/upgrade_312.rst |    40 -
 user_guide_src/source/installation/upgrade_313.rst |    46 -
 user_guide_src/source/installation/upgrade_314.rst |    14 -
 user_guide_src/source/installation/upgrade_315.rst |    14 -
 user_guide_src/source/installation/upgrade_316.rst |    28 -
 user_guide_src/source/installation/upgrade_317.rst |    27 -
 user_guide_src/source/installation/upgrade_b11.rst |    78 -
 user_guide_src/source/installation/upgrading.rst   |    57 -
 user_guide_src/source/libraries/benchmark.rst      |   168 -
 user_guide_src/source/libraries/caching.rst        |   279 -
 user_guide_src/source/libraries/calendar.rst       |   307 -
 user_guide_src/source/libraries/cart.rst           |   398 -
 user_guide_src/source/libraries/config.rst         |   252 -
 user_guide_src/source/libraries/email.rst          |   405 -
 user_guide_src/source/libraries/encrypt.rst        |   198 -
 user_guide_src/source/libraries/encryption.rst     |   585 --
 user_guide_src/source/libraries/file_uploading.rst |   355 -
 .../source/libraries/form_validation.rst           |  1143 ---
 user_guide_src/source/libraries/ftp.rst            |   306 -
 user_guide_src/source/libraries/image_lib.rst      |   475 -
 user_guide_src/source/libraries/index.rst          |     9 -
 user_guide_src/source/libraries/input.rst          |   474 -
 user_guide_src/source/libraries/javascript.rst     |   322 -
 user_guide_src/source/libraries/language.rst       |   210 -
 user_guide_src/source/libraries/loader.rst         |   461 -
 user_guide_src/source/libraries/migration.rst      |   184 -
 user_guide_src/source/libraries/output.rst         |   233 -
 user_guide_src/source/libraries/pagination.rst     |   314 -
 user_guide_src/source/libraries/parser.rst         |   309 -
 user_guide_src/source/libraries/security.rst       |   172 -
 user_guide_src/source/libraries/sessions.rst       |  1062 --
 user_guide_src/source/libraries/table.rst          |   297 -
 user_guide_src/source/libraries/trackback.rst      |   339 -
 user_guide_src/source/libraries/typography.rst     |   107 -
 user_guide_src/source/libraries/unit_testing.rst   |   245 -
 user_guide_src/source/libraries/uri.rst            |   233 -
 user_guide_src/source/libraries/user_agent.rst     |   248 -
 user_guide_src/source/libraries/xmlrpc.rst         |   582 --
 user_guide_src/source/libraries/zip.rst            |   243 -
 user_guide_src/source/license.rst                  |    23 -
 user_guide_src/source/overview/appflow.rst         |    23 -
 user_guide_src/source/overview/at_a_glance.rst     |   114 -
 user_guide_src/source/overview/features.rst        |    46 -
 user_guide_src/source/overview/getting_started.rst |    24 -
 user_guide_src/source/overview/goals.rst           |    32 -
 user_guide_src/source/overview/index.rst           |    15 -
 user_guide_src/source/overview/mvc.rst             |    27 -
 user_guide_src/source/tutorial/conclusion.rst      |    26 -
 .../source/tutorial/create_news_items.rst          |   153 -
 user_guide_src/source/tutorial/index.rst           |    46 -
 user_guide_src/source/tutorial/news_section.rst    |   218 -
 user_guide_src/source/tutorial/static_pages.rst    |   170 -
 522 files changed, 138684 insertions(+), 44067 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100644 DCO.txt
 delete mode 100755 build-release.sh
 delete mode 100644 phpdoc.dist.xml
 delete mode 100644 tests/Bootstrap.php
 delete mode 100644 tests/README.md
 delete mode 100644 tests/codeigniter/Setup_test.php
 delete mode 100644 tests/codeigniter/core/Benchmark_test.php
 delete mode 100644 tests/codeigniter/core/Common_test.php
 delete mode 100644 tests/codeigniter/core/Config_test.php
 delete mode 100644 tests/codeigniter/core/Input_test.php
 delete mode 100644 tests/codeigniter/core/Lang_test.php
 delete mode 100644 tests/codeigniter/core/Loader_test.php
 delete mode 100644 tests/codeigniter/core/Log_test.php
 delete mode 100644 tests/codeigniter/core/Model_test.php
 delete mode 100644 tests/codeigniter/core/Output_test.php
 delete mode 100644 tests/codeigniter/core/Security_test.php
 delete mode 100644 tests/codeigniter/core/URI_test.php
 delete mode 100644 tests/codeigniter/core/Utf8_test.php
 delete mode 100644 tests/codeigniter/core/compat/hash_test.php
 delete mode 100644 tests/codeigniter/core/compat/mbstring_test.php
 delete mode 100644 tests/codeigniter/core/compat/password_test.php
 delete mode 100644 tests/codeigniter/core/compat/standard_test.php
 delete mode 100644 tests/codeigniter/database/DB_driver_test.php
 delete mode 100644 tests/codeigniter/database/DB_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/count_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/delete_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/distinct_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/empty_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/escape_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/from_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/get_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/group_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/insert_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/join_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/like_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/limit_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/order_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/select_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/truncate_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/update_test.php
 delete mode 100644 tests/codeigniter/database/query_builder/where_test.php
 delete mode 100644 tests/codeigniter/helpers/array_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/captcha_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/cookie_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/date_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/directory_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/download_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/email_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/file_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/form_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/html_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/inflector_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/language_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/number_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/path_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/security_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/string_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/text_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/url_helper_test.php
 delete mode 100644 tests/codeigniter/helpers/xml_helper_test.php
 delete mode 100644 tests/codeigniter/libraries/Calendar_test.php
 delete mode 100644 tests/codeigniter/libraries/Driver_test.php
 delete mode 100644 tests/codeigniter/libraries/Encrypt_test.php
 delete mode 100644 tests/codeigniter/libraries/Encryption_test.php
 delete mode 100644 tests/codeigniter/libraries/Form_validation_test.php
 delete mode 100644 tests/codeigniter/libraries/Parser_test.php
 delete mode 100644 tests/codeigniter/libraries/Session_test.php
 delete mode 100644 tests/codeigniter/libraries/Table_test.php
 delete mode 100644 tests/codeigniter/libraries/Typography_test.php
 delete mode 100644 tests/codeigniter/libraries/Upload_test.php
 delete mode 100644 tests/codeigniter/libraries/Useragent_test.php
 delete mode 100644 tests/mocks/autoloader.php
 delete mode 100644 tests/mocks/ci_testcase.php
 delete mode 100644 tests/mocks/ci_testconfig.php
 delete mode 100644 tests/mocks/core/common.php
 delete mode 100644 tests/mocks/core/input.php
 delete mode 100644 tests/mocks/core/security.php
 delete mode 100644 tests/mocks/core/uri.php
 delete mode 100644 tests/mocks/core/utf8.php
 delete mode 100755 tests/mocks/database/ci_test.sqlite
 delete mode 100644 tests/mocks/database/config/mysql.php
 delete mode 100644 tests/mocks/database/config/mysqli.php
 delete mode 100644 tests/mocks/database/config/pdo/mysql.php
 delete mode 100644 tests/mocks/database/config/pdo/pgsql.php
 delete mode 100644 tests/mocks/database/config/pdo/sqlite.php
 delete mode 100644 tests/mocks/database/config/pgsql.php
 delete mode 100644 tests/mocks/database/config/sqlite.php
 delete mode 100644 tests/mocks/database/db.php
 delete mode 100644 tests/mocks/database/db/driver.php
 delete mode 100644 tests/mocks/database/drivers/mysql.php
 delete mode 100644 tests/mocks/database/drivers/mysqli.php
 delete mode 100644 tests/mocks/database/drivers/pdo.php
 delete mode 100644 tests/mocks/database/drivers/postgre.php
 delete mode 100644 tests/mocks/database/drivers/sqlite.php
 delete mode 100644 tests/mocks/database/schema/skeleton.php
 delete mode 100644 tests/mocks/libraries/driver.php
 delete mode 100644 tests/mocks/libraries/encrypt.php
 delete mode 100644 tests/mocks/libraries/encryption.php
 delete mode 100644 tests/mocks/libraries/session.php
 delete mode 100644 tests/mocks/libraries/table.php
 delete mode 100644 tests/mocks/uploads/ci_logo.gif
 delete mode 100644 tests/phpunit.xml
 delete mode 100644 tests/travis/mysql.phpunit.xml
 delete mode 100644 tests/travis/mysqli.phpunit.xml
 delete mode 100644 tests/travis/pdo/mysql.phpunit.xml
 delete mode 100644 tests/travis/pdo/pgsql.phpunit.xml
 delete mode 100644 tests/travis/pdo/sqlite.phpunit.xml
 delete mode 100644 tests/travis/pgsql.phpunit.xml
 delete mode 100644 tests/travis/sqlite.phpunit.xml
 create mode 100644 user_guide/.buildinfo
 create mode 100644 user_guide/DCO.html
 create mode 100644 user_guide/_downloads/ELDocs.tmbundle.zip
 create mode 100644 user_guide/_images/appflowchart.gif
 create mode 100644 user_guide/_images/smile.gif
 create mode 100644 user_guide/_static/ajax-loader.gif
 create mode 100644 user_guide/_static/basic.css
 create mode 100644 user_guide/_static/ci-icon.ico
 create mode 100644 user_guide/_static/comment-bright.png
 create mode 100644 user_guide/_static/comment-close.png
 create mode 100644 user_guide/_static/comment.png
 create mode 100644 user_guide/_static/css/badge_only.css
 create mode 100644 user_guide/_static/css/citheme.css
 create mode 100644 user_guide/_static/css/theme.css
 create mode 100644 user_guide/_static/doctools.js
 create mode 100644 user_guide/_static/down-pressed.png
 create mode 100644 user_guide/_static/down.png
 create mode 100644 user_guide/_static/file.png
 create mode 100644 user_guide/_static/fonts/FontAwesome.otf
 create mode 100644 user_guide/_static/fonts/fontawesome-webfont.eot
 create mode 100644 user_guide/_static/fonts/fontawesome-webfont.svg
 create mode 100644 user_guide/_static/fonts/fontawesome-webfont.ttf
 create mode 100644 user_guide/_static/fonts/fontawesome-webfont.woff
 create mode 100644 user_guide/_static/images/ci-icon.ico
 create mode 100644 user_guide/_static/jquery-3.1.0.js
 create mode 100644 user_guide/_static/jquery.js
 create mode 100644 user_guide/_static/js/oldtheme.js
 create mode 100644 user_guide/_static/js/theme.js
 create mode 100644 user_guide/_static/minus.png
 create mode 100644 user_guide/_static/plus.png
 create mode 100644 user_guide/_static/pygments.css
 create mode 100644 user_guide/_static/searchtools.js
 create mode 100644 user_guide/_static/underscore-1.3.1.js
 create mode 100644 user_guide/_static/underscore.js
 create mode 100644 user_guide/_static/up-pressed.png
 create mode 100644 user_guide/_static/up.png
 create mode 100644 user_guide/_static/websupport.js
 create mode 100644 user_guide/changelog.html
 create mode 100644 user_guide/contributing/index.html
 create mode 100644 user_guide/database/caching.html
 create mode 100644 user_guide/database/call_function.html
 create mode 100644 user_guide/database/configuration.html
 create mode 100644 user_guide/database/connecting.html
 create mode 100644 user_guide/database/db_driver_reference.html
 create mode 100644 user_guide/database/examples.html
 create mode 100644 user_guide/database/forge.html
 create mode 100644 user_guide/database/helpers.html
 create mode 100644 user_guide/database/index.html
 create mode 100644 user_guide/database/metadata.html
 create mode 100644 user_guide/database/queries.html
 create mode 100644 user_guide/database/query_builder.html
 create mode 100644 user_guide/database/results.html
 create mode 100644 user_guide/database/transactions.html
 create mode 100644 user_guide/database/utilities.html
 create mode 100644 user_guide/documentation/index.html
 create mode 100644 user_guide/general/alternative_php.html
 create mode 100644 user_guide/general/ancillary_classes.html
 create mode 100644 user_guide/general/autoloader.html
 create mode 100644 user_guide/general/caching.html
 create mode 100644 user_guide/general/cli.html
 create mode 100644 user_guide/general/common_functions.html
 create mode 100644 user_guide/general/compatibility_functions.html
 create mode 100644 user_guide/general/controllers.html
 create mode 100644 user_guide/general/core_classes.html
 create mode 100644 user_guide/general/creating_drivers.html
 create mode 100644 user_guide/general/creating_libraries.html
 create mode 100644 user_guide/general/credits.html
 create mode 100644 user_guide/general/drivers.html
 create mode 100644 user_guide/general/environments.html
 create mode 100644 user_guide/general/errors.html
 create mode 100644 user_guide/general/helpers.html
 create mode 100644 user_guide/general/hooks.html
 create mode 100644 user_guide/general/index.html
 create mode 100644 user_guide/general/libraries.html
 create mode 100644 user_guide/general/managing_apps.html
 create mode 100644 user_guide/general/models.html
 create mode 100644 user_guide/general/profiling.html
 create mode 100644 user_guide/general/requirements.html
 create mode 100644 user_guide/general/reserved_names.html
 create mode 100644 user_guide/general/routing.html
 create mode 100644 user_guide/general/security.html
 create mode 100644 user_guide/general/styleguide.html
 create mode 100644 user_guide/general/urls.html
 create mode 100644 user_guide/general/views.html
 create mode 100644 user_guide/general/welcome.html
 create mode 100644 user_guide/genindex.html
 create mode 100644 user_guide/helpers/array_helper.html
 create mode 100644 user_guide/helpers/captcha_helper.html
 create mode 100644 user_guide/helpers/cookie_helper.html
 create mode 100644 user_guide/helpers/date_helper.html
 create mode 100644 user_guide/helpers/directory_helper.html
 create mode 100644 user_guide/helpers/download_helper.html
 create mode 100644 user_guide/helpers/email_helper.html
 create mode 100644 user_guide/helpers/file_helper.html
 create mode 100644 user_guide/helpers/form_helper.html
 create mode 100644 user_guide/helpers/html_helper.html
 create mode 100644 user_guide/helpers/index.html
 create mode 100644 user_guide/helpers/inflector_helper.html
 create mode 100644 user_guide/helpers/language_helper.html
 create mode 100644 user_guide/helpers/number_helper.html
 create mode 100644 user_guide/helpers/path_helper.html
 create mode 100644 user_guide/helpers/security_helper.html
 create mode 100644 user_guide/helpers/smiley_helper.html
 create mode 100644 user_guide/helpers/string_helper.html
 create mode 100644 user_guide/helpers/text_helper.html
 create mode 100644 user_guide/helpers/typography_helper.html
 create mode 100644 user_guide/helpers/url_helper.html
 create mode 100644 user_guide/helpers/xml_helper.html
 create mode 100644 user_guide/index.html
 create mode 100644 user_guide/installation/downloads.html
 create mode 100644 user_guide/installation/index.html
 create mode 100644 user_guide/installation/troubleshooting.html
 create mode 100644 user_guide/installation/upgrade_120.html
 create mode 100644 user_guide/installation/upgrade_130.html
 create mode 100644 user_guide/installation/upgrade_131.html
 create mode 100644 user_guide/installation/upgrade_132.html
 create mode 100644 user_guide/installation/upgrade_133.html
 create mode 100644 user_guide/installation/upgrade_140.html
 create mode 100644 user_guide/installation/upgrade_141.html
 create mode 100644 user_guide/installation/upgrade_150.html
 create mode 100644 user_guide/installation/upgrade_152.html
 create mode 100644 user_guide/installation/upgrade_153.html
 create mode 100644 user_guide/installation/upgrade_154.html
 create mode 100644 user_guide/installation/upgrade_160.html
 create mode 100644 user_guide/installation/upgrade_161.html
 create mode 100644 user_guide/installation/upgrade_162.html
 create mode 100644 user_guide/installation/upgrade_163.html
 create mode 100644 user_guide/installation/upgrade_170.html
 create mode 100644 user_guide/installation/upgrade_171.html
 create mode 100644 user_guide/installation/upgrade_172.html
 create mode 100644 user_guide/installation/upgrade_200.html
 create mode 100644 user_guide/installation/upgrade_201.html
 create mode 100644 user_guide/installation/upgrade_202.html
 create mode 100644 user_guide/installation/upgrade_203.html
 create mode 100644 user_guide/installation/upgrade_210.html
 create mode 100644 user_guide/installation/upgrade_211.html
 create mode 100644 user_guide/installation/upgrade_212.html
 create mode 100644 user_guide/installation/upgrade_213.html
 create mode 100644 user_guide/installation/upgrade_214.html
 create mode 100644 user_guide/installation/upgrade_220.html
 create mode 100644 user_guide/installation/upgrade_221.html
 create mode 100644 user_guide/installation/upgrade_222.html
 create mode 100644 user_guide/installation/upgrade_223.html
 create mode 100644 user_guide/installation/upgrade_300.html
 create mode 100644 user_guide/installation/upgrade_301.html
 create mode 100644 user_guide/installation/upgrade_302.html
 create mode 100644 user_guide/installation/upgrade_303.html
 create mode 100644 user_guide/installation/upgrade_304.html
 create mode 100644 user_guide/installation/upgrade_305.html
 create mode 100644 user_guide/installation/upgrade_306.html
 create mode 100644 user_guide/installation/upgrade_310.html
 create mode 100644 user_guide/installation/upgrade_311.html
 create mode 100644 user_guide/installation/upgrade_312.html
 create mode 100644 user_guide/installation/upgrade_313.html
 create mode 100644 user_guide/installation/upgrade_314.html
 create mode 100644 user_guide/installation/upgrade_315.html
 create mode 100644 user_guide/installation/upgrade_316.html
 create mode 100644 user_guide/installation/upgrade_317.html
 create mode 100644 user_guide/installation/upgrade_b11.html
 create mode 100644 user_guide/installation/upgrading.html
 create mode 100644 user_guide/libraries/benchmark.html
 create mode 100644 user_guide/libraries/caching.html
 create mode 100644 user_guide/libraries/calendar.html
 create mode 100644 user_guide/libraries/cart.html
 create mode 100644 user_guide/libraries/config.html
 create mode 100644 user_guide/libraries/email.html
 create mode 100644 user_guide/libraries/encrypt.html
 create mode 100644 user_guide/libraries/encryption.html
 create mode 100644 user_guide/libraries/file_uploading.html
 create mode 100644 user_guide/libraries/form_validation.html
 create mode 100644 user_guide/libraries/ftp.html
 create mode 100644 user_guide/libraries/image_lib.html
 create mode 100644 user_guide/libraries/index.html
 create mode 100644 user_guide/libraries/input.html
 create mode 100644 user_guide/libraries/javascript.html
 create mode 100644 user_guide/libraries/language.html
 create mode 100644 user_guide/libraries/loader.html
 create mode 100644 user_guide/libraries/migration.html
 create mode 100644 user_guide/libraries/output.html
 create mode 100644 user_guide/libraries/pagination.html
 create mode 100644 user_guide/libraries/parser.html
 create mode 100644 user_guide/libraries/security.html
 create mode 100644 user_guide/libraries/sessions.html
 create mode 100644 user_guide/libraries/table.html
 create mode 100644 user_guide/libraries/trackback.html
 create mode 100644 user_guide/libraries/typography.html
 create mode 100644 user_guide/libraries/unit_testing.html
 create mode 100644 user_guide/libraries/uri.html
 create mode 100644 user_guide/libraries/user_agent.html
 create mode 100644 user_guide/libraries/xmlrpc.html
 create mode 100644 user_guide/libraries/zip.html
 create mode 100644 user_guide/license.html
 create mode 100644 user_guide/objects.inv
 create mode 100644 user_guide/overview/appflow.html
 create mode 100644 user_guide/overview/at_a_glance.html
 create mode 100644 user_guide/overview/features.html
 create mode 100644 user_guide/overview/getting_started.html
 create mode 100644 user_guide/overview/goals.html
 create mode 100644 user_guide/overview/index.html
 create mode 100644 user_guide/overview/mvc.html
 create mode 100644 user_guide/search.html
 create mode 100644 user_guide/searchindex.js
 create mode 100644 user_guide/tutorial/conclusion.html
 create mode 100644 user_guide/tutorial/create_news_items.html
 create mode 100644 user_guide/tutorial/index.html
 create mode 100644 user_guide/tutorial/news_section.html
 create mode 100644 user_guide/tutorial/static_pages.html
 delete mode 100644 user_guide_src/Makefile
 delete mode 100644 user_guide_src/README.rst
 delete mode 100644 user_guide_src/cilexer/README
 delete mode 100644 user_guide_src/cilexer/cilexer/__init__.py
 delete mode 100644 user_guide_src/cilexer/cilexer/cilexer.py
 delete mode 100644 user_guide_src/cilexer/setup.py
 delete mode 100644 user_guide_src/source/DCO.rst
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/LICENSE
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/__init__.py
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/breadcrumbs.html
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/footer.html
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/layout.html
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/layout_old.html
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/pulldown.html
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/search.html
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/searchbox.html
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/css/badge_only.css
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/css/citheme.css
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/css/theme.css
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/images/ci-icon.ico
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/js/oldtheme.js
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/js/theme.js
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/theme.conf
 delete mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/versions.html
 delete mode 100644 user_guide_src/source/changelog.rst
 delete mode 100644 user_guide_src/source/conf.py
 delete mode 100644 user_guide_src/source/contributing/index.rst
 delete mode 100644 user_guide_src/source/database/caching.rst
 delete mode 100644 user_guide_src/source/database/call_function.rst
 delete mode 100644 user_guide_src/source/database/configuration.rst
 delete mode 100644 user_guide_src/source/database/connecting.rst
 delete mode 100644 user_guide_src/source/database/db_driver_reference.rst
 delete mode 100644 user_guide_src/source/database/examples.rst
 delete mode 100644 user_guide_src/source/database/forge.rst
 delete mode 100644 user_guide_src/source/database/helpers.rst
 delete mode 100644 user_guide_src/source/database/index.rst
 delete mode 100644 user_guide_src/source/database/metadata.rst
 delete mode 100644 user_guide_src/source/database/queries.rst
 delete mode 100644 user_guide_src/source/database/query_builder.rst
 delete mode 100644 user_guide_src/source/database/results.rst
 delete mode 100644 user_guide_src/source/database/transactions.rst
 delete mode 100644 user_guide_src/source/database/utilities.rst
 delete mode 100644 user_guide_src/source/documentation/ELDocs.tmbundle.zip
 delete mode 100644 user_guide_src/source/documentation/index.rst
 delete mode 100644 user_guide_src/source/general/alternative_php.rst
 delete mode 100644 user_guide_src/source/general/ancillary_classes.rst
 delete mode 100644 user_guide_src/source/general/autoloader.rst
 delete mode 100644 user_guide_src/source/general/caching.rst
 delete mode 100644 user_guide_src/source/general/cli.rst
 delete mode 100644 user_guide_src/source/general/common_functions.rst
 delete mode 100644 user_guide_src/source/general/compatibility_functions.rst
 delete mode 100644 user_guide_src/source/general/controllers.rst
 delete mode 100644 user_guide_src/source/general/core_classes.rst
 delete mode 100644 user_guide_src/source/general/creating_drivers.rst
 delete mode 100644 user_guide_src/source/general/creating_libraries.rst
 delete mode 100644 user_guide_src/source/general/credits.rst
 delete mode 100644 user_guide_src/source/general/drivers.rst
 delete mode 100644 user_guide_src/source/general/environments.rst
 delete mode 100644 user_guide_src/source/general/errors.rst
 delete mode 100644 user_guide_src/source/general/helpers.rst
 delete mode 100644 user_guide_src/source/general/hooks.rst
 delete mode 100644 user_guide_src/source/general/index.rst
 delete mode 100644 user_guide_src/source/general/libraries.rst
 delete mode 100644 user_guide_src/source/general/managing_apps.rst
 delete mode 100644 user_guide_src/source/general/models.rst
 delete mode 100644 user_guide_src/source/general/profiling.rst
 delete mode 100644 user_guide_src/source/general/requirements.rst
 delete mode 100644 user_guide_src/source/general/reserved_names.rst
 delete mode 100644 user_guide_src/source/general/routing.rst
 delete mode 100644 user_guide_src/source/general/security.rst
 delete mode 100644 user_guide_src/source/general/styleguide.rst
 delete mode 100644 user_guide_src/source/general/urls.rst
 delete mode 100644 user_guide_src/source/general/views.rst
 delete mode 100644 user_guide_src/source/general/welcome.rst
 delete mode 100644 user_guide_src/source/helpers/array_helper.rst
 delete mode 100644 user_guide_src/source/helpers/captcha_helper.rst
 delete mode 100644 user_guide_src/source/helpers/cookie_helper.rst
 delete mode 100644 user_guide_src/source/helpers/date_helper.rst
 delete mode 100644 user_guide_src/source/helpers/directory_helper.rst
 delete mode 100644 user_guide_src/source/helpers/download_helper.rst
 delete mode 100644 user_guide_src/source/helpers/email_helper.rst
 delete mode 100644 user_guide_src/source/helpers/file_helper.rst
 delete mode 100644 user_guide_src/source/helpers/form_helper.rst
 delete mode 100644 user_guide_src/source/helpers/html_helper.rst
 delete mode 100644 user_guide_src/source/helpers/index.rst
 delete mode 100644 user_guide_src/source/helpers/inflector_helper.rst
 delete mode 100644 user_guide_src/source/helpers/language_helper.rst
 delete mode 100644 user_guide_src/source/helpers/number_helper.rst
 delete mode 100644 user_guide_src/source/helpers/path_helper.rst
 delete mode 100644 user_guide_src/source/helpers/security_helper.rst
 delete mode 100644 user_guide_src/source/helpers/smiley_helper.rst
 delete mode 100644 user_guide_src/source/helpers/string_helper.rst
 delete mode 100644 user_guide_src/source/helpers/text_helper.rst
 delete mode 100644 user_guide_src/source/helpers/typography_helper.rst
 delete mode 100644 user_guide_src/source/helpers/url_helper.rst
 delete mode 100644 user_guide_src/source/helpers/xml_helper.rst
 delete mode 100644 user_guide_src/source/images/appflowchart.gif
 delete mode 100644 user_guide_src/source/images/arrow.gif
 delete mode 100644 user_guide_src/source/images/ci-icon.ico
 delete mode 100644 user_guide_src/source/images/ci_logo.jpg
 delete mode 100644 user_guide_src/source/images/ci_logo_flame.jpg
 delete mode 100644 user_guide_src/source/images/file.gif
 delete mode 100644 user_guide_src/source/images/folder.gif
 delete mode 100644 user_guide_src/source/images/smile.gif
 delete mode 100644 user_guide_src/source/index.rst
 delete mode 100644 user_guide_src/source/installation/downloads.rst
 delete mode 100644 user_guide_src/source/installation/index.rst
 delete mode 100644 user_guide_src/source/installation/troubleshooting.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_120.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_130.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_131.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_132.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_133.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_140.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_141.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_150.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_152.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_153.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_154.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_160.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_161.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_162.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_163.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_170.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_171.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_172.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_200.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_201.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_202.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_203.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_210.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_211.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_212.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_213.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_214.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_220.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_221.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_222.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_223.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_300.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_301.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_302.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_303.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_304.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_305.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_306.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_310.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_311.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_312.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_313.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_314.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_315.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_316.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_317.rst
 delete mode 100644 user_guide_src/source/installation/upgrade_b11.rst
 delete mode 100644 user_guide_src/source/installation/upgrading.rst
 delete mode 100644 user_guide_src/source/libraries/benchmark.rst
 delete mode 100644 user_guide_src/source/libraries/caching.rst
 delete mode 100644 user_guide_src/source/libraries/calendar.rst
 delete mode 100644 user_guide_src/source/libraries/cart.rst
 delete mode 100644 user_guide_src/source/libraries/config.rst
 delete mode 100644 user_guide_src/source/libraries/email.rst
 delete mode 100644 user_guide_src/source/libraries/encrypt.rst
 delete mode 100644 user_guide_src/source/libraries/encryption.rst
 delete mode 100644 user_guide_src/source/libraries/file_uploading.rst
 delete mode 100644 user_guide_src/source/libraries/form_validation.rst
 delete mode 100644 user_guide_src/source/libraries/ftp.rst
 delete mode 100644 user_guide_src/source/libraries/image_lib.rst
 delete mode 100644 user_guide_src/source/libraries/index.rst
 delete mode 100644 user_guide_src/source/libraries/input.rst
 delete mode 100644 user_guide_src/source/libraries/javascript.rst
 delete mode 100644 user_guide_src/source/libraries/language.rst
 delete mode 100644 user_guide_src/source/libraries/loader.rst
 delete mode 100644 user_guide_src/source/libraries/migration.rst
 delete mode 100644 user_guide_src/source/libraries/output.rst
 delete mode 100644 user_guide_src/source/libraries/pagination.rst
 delete mode 100644 user_guide_src/source/libraries/parser.rst
 delete mode 100644 user_guide_src/source/libraries/security.rst
 delete mode 100644 user_guide_src/source/libraries/sessions.rst
 delete mode 100644 user_guide_src/source/libraries/table.rst
 delete mode 100644 user_guide_src/source/libraries/trackback.rst
 delete mode 100644 user_guide_src/source/libraries/typography.rst
 delete mode 100644 user_guide_src/source/libraries/unit_testing.rst
 delete mode 100644 user_guide_src/source/libraries/uri.rst
 delete mode 100644 user_guide_src/source/libraries/user_agent.rst
 delete mode 100644 user_guide_src/source/libraries/xmlrpc.rst
 delete mode 100644 user_guide_src/source/libraries/zip.rst
 delete mode 100644 user_guide_src/source/license.rst
 delete mode 100644 user_guide_src/source/overview/appflow.rst
 delete mode 100644 user_guide_src/source/overview/at_a_glance.rst
 delete mode 100644 user_guide_src/source/overview/features.rst
 delete mode 100644 user_guide_src/source/overview/getting_started.rst
 delete mode 100644 user_guide_src/source/overview/goals.rst
 delete mode 100644 user_guide_src/source/overview/index.rst
 delete mode 100644 user_guide_src/source/overview/mvc.rst
 delete mode 100644 user_guide_src/source/tutorial/conclusion.rst
 delete mode 100644 user_guide_src/source/tutorial/create_news_items.rst
 delete mode 100644 user_guide_src/source/tutorial/index.rst
 delete mode 100644 user_guide_src/source/tutorial/news_section.rst
 delete mode 100644 user_guide_src/source/tutorial/static_pages.rst

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 88c774283..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-language: php
-dist: precise
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - master
-  - hhvm
-  
-env:
-  - DB=mysql
-  - DB=mysqli
-  - DB=pgsql
-  - DB=sqlite
-  - DB=pdo/mysql
-  - DB=pdo/pgsql
-  - DB=pdo/sqlite
-
-sudo: false
-
-before_script:
-  - sh -c "composer install --dev --no-progress"
-  - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
-
-script: php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7 -d mbstring.internal_encoding=UTF-8 vendor/bin/phpunit --coverage-text --configuration tests/travis/$DB.phpunit.xml
-
-matrix:
-  allow_failures:
-    - php: hhvm
-    - php: master
-  exclude:
-    - php: hhvm
-      env: DB=pgsql
-    - php: hhvm
-      env: DB=pdo/pgsql
-    - php: 7.0
-      env: DB=mysql
-    - php: 7.1
-      env: DB=mysql
-    - php: 7.2
-      env: DB=mysql
-    - php: master
-      env: DB=mysql
-
-branches:
-  only:
-    - develop
-    - 3.0-stable
-    - 3.1-stable
-    - /^feature\/.+$/
diff --git a/DCO.txt b/DCO.txt
deleted file mode 100644
index a404c0d38..000000000
--- a/DCO.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(1)	The contribution was created in whole or in part by me and I
-	have the right to submit it under the open source license
-	indicated in the file; or
-
-(2)	The contribution is based upon previous work that, to the best
-	of my knowledge, is covered under an appropriate open source
-	license and I have the right under that license to submit that
-	work with modifications, whether created in whole or in part
-	by me, under the same open source license (unless I am
-	permitted to submit under a different license), as indicated
-	in the file; or
-
-(3)	The contribution was provided directly to me by some other
-	person who certified (1), (2) or (3) and I have not modified
-	it.
-
-(4)	I understand and agree that this project and the contribution
-	are public and that a record of the contribution (including all
-	personal information I submit with it, including my sign-off) is
-	maintained indefinitely and may be redistributed consistent with
-	this project or the open source license(s) involved.
diff --git a/build-release.sh b/build-release.sh
deleted file mode 100755
index 6b3b31d12..000000000
--- a/build-release.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env bash
-
-cd $(dirname $BASH_SOURCE)
-
-if [ $# -eq 0 ]; then
-	echo 'Usage: '$BASH_SOURCE' '
-	exit 1
-fi
-
-version_number=$1
-
-if [ ${#version_number} -lt 5 ]
-then
-	echo "Provided version number is too short"
-	exit 1
-elif [ ${version_number: -4} == "-dev" ]
-then
-	echo "'-dev' releases are not allowed"
-	exit 1
-fi
-
-version_id=${version_number:0:5}
-version_id=${version_id//./}
-upgrade_rst='user_guide_src/source/installation/upgrade_'$version_id'.rst'
-
-if [ ${#version_id} -ne 3 ]
-then
-	echo "Invalid version number format"
-	exit 1
-elif [ `grep -c -F --regexp="'$version_number'" system/core/CodeIgniter.php` -ne 1 ]
-then
-	echo "Provided version number doesn't match in system/core/CodeIgniter.php"
-	exit 1
-elif [ `grep -c -F --regexp="'$version_number'" user_guide_src/source/conf.py` -ne 2 ]
-then
-	echo "Provided version number doesn't match in user_guide_src/source/conf.py"
-	exit 1
-elif [ `grep -c -F --regexp="$version_number (Current version) " user_guide_src/source/installation/downloads.rst` -ne 1 ]
-then
-	echo "user_guide_src/source/installation/downloads.rst doesn't appear to contain a link for this version"
-	exit 1
-elif [ ! -f "$upgrade_rst" ]
-then
-	echo "${upgrade_rst} doesn't exist"
-	exit 1
-fi
-
-echo "Running tests ..."
-
-cd tests/
-phpunit
-
-if [ $? -ne 0 ]
-then
-	echo "Build FAILED!"
-	exit 1
-fi
-
-cd ..
-cd user_guide_src/
-
-echo ""
-echo "Building HTML docs; please check output for warnings ..."
-echo ""
-
-make html
-
-echo ""
-
-if [ $? -ne 0 ]
-then
-	echo "Build FAILED!"
-	exit 1
-fi
-
-echo "Building EPUB docs; please check output for warnings ..."
-echo ""
-
-make epub
-
-echo ""
-
-if [ $? -ne 0 ]
-then
-	echo "Build FAILED!"
-	exit 1
-fi
-
-cd ..
-
-if [ -d user_guide/ ]
-then
-	rm -r user_guide/
-fi
-
-cp -r user_guide_src/build/html/ user_guide/
-cp user_guide_src/build/epub/CodeIgniter.epub "CodeIgniter ${version_number}.epub"
-
-echo "Build complete."
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
deleted file mode 100644
index 6dc58c259..000000000
--- a/phpdoc.dist.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-	CodeIgniter v3.0.0 API
-    
-        ./api/
-    
-    
-        ./api/
-    
-    
-        ./system
-    
-
-    
-        warn
-        
-            ./api/log/{DATE}.log
-            ./api/{DATE}.errors.log
-        
-    
-
\ No newline at end of file
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
deleted file mode 100644
index b4e56bdae..000000000
--- a/tests/Bootstrap.php
+++ /dev/null
@@ -1,76 +0,0 @@
-= 3.5.6
-
-	pear channel-discover pear.phpunit.de
-	pear channel-discover pear.symfony.com
-	pear install phpunit/PHPUnit
-
-vfsStream
-
-	pear channel-discover pear.bovigo.org
-	pear install bovigo/vfsStream-beta
-
-#### Installation of PEAR and PHPUnit on Ubuntu
-
-  Installation on Ubuntu requires a few steps. Depending on your setup you may
-  need to use 'sudo' to install these. Mileage may vary but these steps are a
-  good start.
-
-	# Install the PEAR package
-	sudo apt-get install php-pear
-
-	# Add a few sources to PEAR
-	pear channel-discover pear.phpunit.de
-	pear channel-discover pear.symfony-project.com
-	pear channel-discover components.ez.no
-	pear channel-discover pear.bovigo.org
-
-	# Finally install PHPUnit and vfsStream (including dependencies)
-	pear install --alldeps phpunit/PHPUnit
-	pear install --alldeps bovigo/vfsStream-beta
-
-	# Finally, run 'phpunit' from within the ./tests directory
-	# and you should be on your way!
-
-## Test Suites:
-
-CodeIgniter bootstraps a request very directly, with very flat class
-hierarchy. As a result, there is no main CodeIgniter class until the
-controller is instantiated.
-
-This has forced the core classes to be relatively decoupled, which is
-a good thing. However, it makes that portion of code relatively hard
-to test.
-
-Right now that means we'll probably have two core test suites, along
-with a base for application and package tests. That gives us:
-
-1. Bootstrap Test	- test common.php and sanity check codeigniter.php [in planning]
-2. System Test		- test core components in relative isolation [in development]
-3. Application Test	- bootstrapping for application/tests [not started]
-4. Package Test		- bootstrapping for /tests [not started]
-
-### Test Environment:
-
-The test/Bootstrap.php file establishes global constants such as BASEPATH,
-APPPATH, and VIEWPATH, initializing them to point to VFS locations. The
-test case class employs vfsStream to make a clean virtual filesystem with
-the necessary paths for every individual test.
-
-Within each test case, VFS directory objects are available to use as arguments
-to the VFS convenience functions (see below):
-
-- ci_vfs_root: VFS filesystem root
-- ci_app_root: Application directory
-- ci_base_root: System directory
-- ci_view_root: Views directory
-
-Classes being instantiated for testing are read from the actual filesystem
-by the unit test autoloader, as are mockups created in tests/mocks. If you
-need access to the real system directory, the SYSTEM_PATH constant always
-points to it.
-
-Any other resources which need to be read from the path constants must be
-created or cloned within your test. Functions for doing so are outlined
-below.
-
-### CI_TestCase Documentation
-
-Test cases should extend CI_TestCase. This internally extends
-PHPUnit\_Framework\_TestCase, so you have access to all of your
-usual PHPUnit methods.
-
-We need to provide a simple way to modify the globals and the
-common function output. We also need to be able to mock up
-the super object as we please.
-
-Current API is *not stable*. Names and implementations will change.
-
-    $this->ci_set_config($key, $val)
-
-Set the global config variables in a mock Config object. If key is an array,
-it will replace the entire config array. They are _not_ merged. If called
-without any parameters, it will create the mock object but not set any values.
-The mock Config object also provides rudimentary item() and load() stubs for
-delivering configured values to classes being tested and handling config load
-calls, respectively. The load() stub does _not_ actually load any files, it
-only records the filename provided. Check the config->loaded array to verify
-calls made.
-
-    $this->ci_instance($obj)
-
-Set the object to use as the "super object", in a lot
-of cases this will be a simple stdClass with the attributes
-you need it to have. If no parameter, will return the instance.
-
-	$this->ci_instance_var($name, $val)
-
-Add an attribute to the super object. This is useful if you
-set up a simple instance in setUp and then need to add different
-class mockups to your super object.
-
-	$this->ci_core_class($name)
-
-Get the _class name_ of a core class, so that you can instantiate
-it. The variable is returned by reference and is tied to the correct
-$GLOBALS key. For example:
-    
-	$cfg =& $this->ci_core_class('cfg'); // returns 'CI_Config'
-    $cfg = new $cfg; // instantiates config and overwrites the CFG global
-
-	$this->ci_set_core_class($name, $obj)
-
-An alternative way to set one of the core globals.
-
-	$this->ci_vfs_mkdir($name, $root)
-
-Creates a new directory in the test VFS. Pass a directory object to be the
-parent directory or none to create a root-level directory. Returns the new
-directory object.
-
-	$this->ci_vfs_create($file, $content, $root, $path)
-
-Creates a new VFS file. '.php' is automatically appended to the filename if
-it has no extension. Pass a directory object as the root, and an optional path
-to recurse and/or create for containing the file. Path may be a string (such
-as 'models/subdir') or an array (e.g. - array('models', 'subdir') ). Existing
-directories in the VFS root will be recursed until a new directory is
-identified - all others in the path will be created, so you can mix-and-match
-old and new directories. If $file is an array (key = name, value = content),
-multiple files will be created in the same path.
-
-	$this->ci_vfs_clone($path)
-
-Clones an existing file from the real filesystem to exist in the same path of
-the VFS. Path must be relative to the project root (i.e. - starting with
-'system' or 'application').
-
-	$this->ci_vfs_path($path, $base)
-
-Creates a VFS file path string suitable for use with PHP file operations. Path
-may be absolute from the VFS root, or relative to a base path. It is often
-useful to use APPPATH or BASEPATH as the base.
-
-	$this->helper($name)
-
-Loads a helper from the real filesystem.
-
-	$this->lang($name)
-
-Loads a language file from the real filesystem and returns the $lang array.
-
-	$this->ci_get_config()  __internal__
-
-Returns the global config array. Internal as you shouldn't need to
-call this (you're setting it, after all). Used internally to make
-CI's get_config() work.
-
-	CI_TestCase::instance()  __internal__
-
-Returns an instance of the current test case. We force phpunit to
-run with backup-globals enabled, so this will always be the instance
-of the currently running test class.
-
-### Going forward
-
-#### 1. Bootstrap Test
-
-Testing common.php should be pretty simple. Include the file, and test the
-functions. May require some tweaking so that we can grab the statics from all
-methods (see is_loaded()). Testing the actual CodeIgniter.php file will most
-likely be an output test for the default view, with some object checking after
-the file runs. Needs consideration.
-
-#### 2. System Test
-
-Testing the core system relies on being able to isolate the core components
-as much as possible. A few of them access other core classes as globals. These
-should be mocked up and easy to manipulate.
-
-All functions in common.php should be a minimal implementation, or and mapped
-to a method in the test's parent class to gives us full control of their output.
-
-#### 3. Application Test:
-
-Not sure yet, needs to handle:
-
-- Libraries
-- Helpers
-- Models
-- MY_* files
-- Controllers (uh...?)
-- Views? (watir, selenium, cucumber?)
-- Database Testing
-
-#### 4. Package Test:
-
-I don't have a clue how this will work.
-
-Needs to be able to handle packages
-that are used multiple times within the application (i.e. EE/Pyro modules)
-as well as packages that are used by multiple applications (library distributions)
\ No newline at end of file
diff --git a/tests/codeigniter/Setup_test.php b/tests/codeigniter/Setup_test.php
deleted file mode 100644
index 5317c56c7..000000000
--- a/tests/codeigniter/Setup_test.php
+++ /dev/null
@@ -1,13 +0,0 @@
-assertTrue(defined('PROJECT_BASE'));
-		$this->assertTrue(defined('BASEPATH'));
-		$this->assertTrue(defined('APPPATH'));
-		$this->assertTrue(defined('VIEWPATH'));
-	}
-
-}
\ No newline at end of file
diff --git a/tests/codeigniter/core/Benchmark_test.php b/tests/codeigniter/core/Benchmark_test.php
deleted file mode 100644
index 33bd742b2..000000000
--- a/tests/codeigniter/core/Benchmark_test.php
+++ /dev/null
@@ -1,67 +0,0 @@
-benchmark = new CI_Benchmark();
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_mark()
-	{
-		$this->assertEmpty($this->benchmark->marker);
-
-		$this->benchmark->mark('code_start');
-
-		$this->assertCount(1, $this->benchmark->marker);
-		$this->assertArrayHasKey('code_start', $this->benchmark->marker);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_elapsed_time()
-	{
-		$this->assertEquals('{elapsed_time}', $this->benchmark->elapsed_time());
-		$this->assertEmpty($this->benchmark->elapsed_time('undefined_point'));
-
-		$this->benchmark->mark('code_start');
-		$this->benchmark->mark('code_end');
-
-		// Override values, because time isn't testable, but make sure the markers were set
-		if (isset($this->benchmark->marker['code_start']) && is_float($this->benchmark->marker['code_start']))
-		{
-			$this->benchmark->marker['code_start'] = 1389956144.1944;
-		}
-
-		if (isset($this->benchmark->marker['code_end']) && is_float($this->benchmark->marker['code_end']))
-		{
-			$this->benchmark->marker['code_end'] = 1389956145.1946;
-		}
-
-		$this->assertEquals('1', $this->benchmark->elapsed_time('code_start', 'code_end', 0));
-		$this->assertEquals('1.0', $this->benchmark->elapsed_time('code_start', 'code_end', 1));
-		$this->assertEquals('1.00', $this->benchmark->elapsed_time('code_start', 'code_end', 2));
-		$this->assertEquals('1.000', $this->benchmark->elapsed_time('code_start', 'code_end', 3));
-		$this->assertEquals('1.0002', $this->benchmark->elapsed_time('code_start', 'code_end', 4));
-		$this->assertEquals('1.0002', $this->benchmark->elapsed_time('code_start', 'code_end'));
-
-		// Test with non-existing 2nd marker, but again - we need to override the value
-		$this->benchmark->elapsed_time('code_start', 'code_end2');
-		if (isset($this->benchmark->marker['code_end2']) && is_float($this->benchmark->marker['code_end2']))
-		{
-			$this->benchmark->marker['code_end2'] = 1389956146.2046;
-		}
-
-		$this->assertEquals('2.0102', $this->benchmark->elapsed_time('code_start', 'code_end2'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_memory_usage()
-	{
-		$this->assertEquals('{memory_usage}', $this->benchmark->memory_usage());
-	}
-
-}
diff --git a/tests/codeigniter/core/Common_test.php b/tests/codeigniter/core/Common_test.php
deleted file mode 100644
index effae50c5..000000000
--- a/tests/codeigniter/core/Common_test.php
+++ /dev/null
@@ -1,69 +0,0 @@
-assertTrue(is_php('1.2.0'));
-		$this->assertFalse(is_php('9999.9.9'));
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function test_stringify_attributes()
-	{
-		$this->assertEquals(' class="foo" id="bar"', _stringify_attributes(array('class' => 'foo', 'id' => 'bar')));
-
-		$atts = new stdClass;
-		$atts->class = 'foo';
-		$atts->id = 'bar';
-		$this->assertEquals(' class="foo" id="bar"', _stringify_attributes($atts));
-
-		$atts = new stdClass;
-		$this->assertEquals('', _stringify_attributes($atts));
-
-		$this->assertEquals(' class="foo" id="bar"', _stringify_attributes('class="foo" id="bar"'));
-
-		$this->assertEquals('', _stringify_attributes(array()));
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function test_stringify_js_attributes()
-	{
-		$this->assertEquals('width=800,height=600', _stringify_attributes(array('width' => '800', 'height' => '600'), TRUE));
-
-		$atts = new stdClass;
-		$atts->width = 800;
-		$atts->height = 600;
-		$this->assertEquals('width=800,height=600', _stringify_attributes($atts, TRUE));
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function test_html_escape()
-	{
-		$this->assertEquals(
-			html_escape('Here is a string containing "quoted" text.'),
-			'Here is a string containing "quoted" text.'
-		);
-
-		$this->assertEquals(
-			html_escape(array('associative' => 'and', array('multi' => 'dimentional'))),
-			array('associative' => 'and', array('multi' => 'dimentional'))
-		);
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function test_remove_invisible_characters()
-	{
-		$raw_string = 'Here is a string containing invisible'.chr(0x08).' text %0e.';
-		$removed_string = 'Here is a string containing invisible text %0e.';
-		$this->assertEquals($removed_string, remove_invisible_characters($raw_string, FALSE));
-
-		$raw_string = 'Here is a string %0econtaining url_encoded invisible%1F text.';
-		$removed_string = 'Here is a string containing url_encoded invisible text.';
-		$this->assertEquals($removed_string, remove_invisible_characters($raw_string));
-	}
-}
diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php
deleted file mode 100644
index b5c9e849d..000000000
--- a/tests/codeigniter/core/Config_test.php
+++ /dev/null
@@ -1,240 +0,0 @@
-ci_core_class('cfg');
-
-		// set predictable config values
-		$this->cfg = array(
-			'index_page'		=> 'index.php',
-			'base_url'		=> 'http://example.com/',
-			'subclass_prefix'	=> 'MY_'
-		);
-		$this->ci_set_config($this->cfg);
-
-		$this->config = new $cls;
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_item()
-	{
-		$this->assertEquals($this->cfg['base_url'], $this->config->item('base_url'));
-
-		// Bad Config value
-		$this->assertNull($this->config->item('no_good_item'));
-
-		// Index
-		$this->assertNull($this->config->item('no_good_item', 'bad_index'));
-		$this->assertNull($this->config->item('no_good_item', 'default'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_set_item()
-	{
-		$this->assertNull($this->config->item('not_yet_set'));
-
-		$this->config->set_item('not_yet_set', 'is set');
-		$this->assertEquals('is set', $this->config->item('not_yet_set'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_slash_item()
-	{
-		// Bad Config value
-		$this->assertNull($this->config->slash_item('no_good_item'));
-
-		$this->assertEquals($this->cfg['base_url'], $this->config->slash_item('base_url'));
-		$this->assertEquals($this->cfg['subclass_prefix'].'/', $this->config->slash_item('subclass_prefix'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_base_url()
-	{
-		// Test regular base URL
-		$base_url = $this->cfg['base_url'];
-		$this->assertEquals($base_url, $this->config->base_url());
-
-		// Test with URI
-		$uri = 'test';
-		$this->assertEquals($base_url.$uri, $this->config->base_url($uri));
-
-		// Clear base_url
-		$this->ci_set_config('base_url', '');
-
-		// Rerun constructor
-		$cls =& $this->ci_core_class('cfg');
-		$this->config = new $cls;
-
-		// Test default base
-		$this->assertEquals('http://localhost/', $this->config->base_url());
-
-		// Capture server vars
-		$old_host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : NULL;
-		$old_script_name = isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : NULL;
-		$old_script_filename = $_SERVER['SCRIPT_FILENAME'];
-		$old_https = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : NULL;
-		$old_server_addr = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : NULL;
-
-		// The 'Host' header is user input and must not be trusted
-		$_SERVER['HTTP_HOST'] = 'test.com';
-		$this->config = new $cls;
-		$this->assertEquals('http://localhost/', $this->config->base_url());
-
-		// However, we may fallback to the server's IP address
-		$_SERVER['SERVER_ADDR'] = '127.0.0.1';
-		$_SERVER['SCRIPT_NAME'] = '/base_test.php';
-		$_SERVER['SCRIPT_FILENAME'] = '/foo/bar/base_test.php';
-		$this->config = new $cls;
-		$this->assertEquals('http://127.0.0.1/', $this->config->base_url());
-
-		// Making sure that HTTPS and URI path are also detected
-		$_SERVER['HTTPS'] = 'on';
-		$_SERVER['SCRIPT_NAME'] = '/path/base_test.php';
-		$_SERVER['SCRIPT_FILENAME'] = '/foo/bar/path/base_test.php';
-		$this->config = new $cls;
-		$this->assertEquals('https://127.0.0.1/path/', $this->config->base_url());
-
-		// Restore server vars
-		$_SERVER['HTTP_HOST'] = $old_host;
-		$_SERVER['SCRIPT_NAME'] = $old_script_name;
-		$_SERVER['SCRIPT_FILENAME'] = $old_script_filename;
-		$_SERVER['HTTPS'] = $old_https;
-		$_SERVER['SERVER_ADDR'] = $old_server_addr;
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_site_url()
-	{
-		$base_url = $this->cfg['base_url'];
-		$index_page = $this->cfg['index_page'];
-		$this->assertEquals($base_url.$index_page, $this->config->site_url());
-
-		$old_base = $this->config->item('base_url');
-		$this->config->set_item('base_url', '');
-
-		$q_string = $this->config->item('enable_query_strings');
-		$this->config->set_item('enable_query_strings', FALSE);
-
-		$uri = 'test';
-		$uri2 = '1';
-		$this->assertEquals($index_page.'/'.$uri, $this->config->site_url($uri));
-		$this->assertEquals($index_page.'/'.$uri.'/'.$uri2, $this->config->site_url(array($uri, $uri2)));
-
-		$this->assertEquals($index_page.'/test/', $this->config->site_url('test/'));
-
-		$suffix = 'ing';
-		$this->config->set_item('url_suffix', $suffix);
-
-		$arg = 'pass';
-		$this->assertEquals($index_page.'/'.$uri.$suffix, $this->config->site_url($uri));
-		$this->assertEquals($index_page.'/'.$uri.$suffix.'?'.$arg, $this->config->site_url($uri.'?'.$arg));
-
-		$this->config->set_item('url_suffix', FALSE);
-		$this->config->set_item('enable_query_strings', TRUE);
-
-		$this->assertEquals($index_page.'?'.$uri, $this->config->site_url($uri));
-		$this->assertEquals($index_page.'?0='.$uri.'&1='.$uri2, $this->config->site_url(array($uri, $uri2)));
-
-		$this->config->set_item('base_url', $old_base);
-
-		$this->assertEquals($base_url.$index_page.'?'.$uri, $this->config->site_url($uri));
-
-		// back to home base
-		$this->config->set_item('enable_query_strings', $q_string);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_system_url()
-	{
-		$this->assertEquals($this->cfg['base_url'].'system/', $this->config->system_url());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_load()
-	{
-		// Test regular load
-		$file = 'test.php';
-		$key = 'testconfig';
-		$val = 'my_value';
-		$cfg = array($key => $val);
-		$this->ci_vfs_create($file, 'ci_app_root, 'config');
-		$this->assertTrue($this->config->load($file));
-		$this->assertEquals($val, $this->config->item($key));
-
-		// Test reload - value should not change
-		$val2 = 'new_value';
-		$cfg = array($key => $val2);
-		$this->ci_vfs_create($file, 'ci_app_root, 'config');
-		$this->assertTrue($this->config->load($file));
-		$this->assertEquals($val, $this->config->item($key));
-
-		// Test section load
-		$file = 'secttest';
-		$cfg = array(
-			'one' => 'prime',
-			'two' => 2,
-			'three' => TRUE
-		);
-		$this->ci_vfs_create($file.'.php', 'ci_app_root, 'config');
-		$this->assertTrue($this->config->load($file, TRUE));
-		$this->assertEquals($cfg, $this->config->item($file));
-
-		// Test section merge
-		$cfg2 = array(
-			'three' => 'tres',
-			'number' => 42,
-			'letter' => 'Z'
-		);
-
-		$pkg_dir = 'package';
-		$this->ci_vfs_create(
-			$file.'.php',
-			'ci_app_root,
-			array($pkg_dir, 'config')
-		);
-		array_unshift($this->config->_config_paths, $this->ci_vfs_path($pkg_dir.'/', APPPATH));
-		$this->assertTrue($this->config->load($file, TRUE));
-		$this->assertEquals(array_merge($cfg, $cfg2), $this->config->item($file));
-		array_shift($this->config->_config_paths);
-
-		// Test graceful fail of invalid file
-		$file = 'badfile';
-		$this->ci_vfs_create($file, '', $this->ci_app_root, 'config');
-		$this->assertFalse($this->config->load($file, FALSE, TRUE));
-
-		// Test regular fail of invalid file
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Your '.$this->ci_vfs_path('config/'.$file.'.php', APPPATH).
-				' file does not appear to contain a valid configuration array.'
-		);
-		$this->assertNull($this->config->load($file));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_load_nonexistent()
-	{
-		// Test graceful fail of nonexistent file
-		$this->assertFalse($this->config->load('not_config_file', FALSE, TRUE));
-
-		// Test regular fail
-		$file = 'absentia';
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: The configuration file '.$file.'.php does not exist.'
-		);
-		$this->assertNull($this->config->load($file));
-	}
-
-}
\ No newline at end of file
diff --git a/tests/codeigniter/core/Input_test.php b/tests/codeigniter/core/Input_test.php
deleted file mode 100644
index 976941d41..000000000
--- a/tests/codeigniter/core/Input_test.php
+++ /dev/null
@@ -1,281 +0,0 @@
-ci_set_config('allow_get_array',	TRUE);
-		$this->ci_set_config('global_xss_filtering', FALSE);
-		$this->ci_set_config('csrf_protection', FALSE);
-
-		$security = new Mock_Core_Security();
-
-		$this->ci_set_config('charset', 'UTF-8');
-		$utf8 = new Mock_Core_Utf8();
-
-		$this->input = new Mock_Core_Input($security, $utf8);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_get_not_exists()
-	{
-		$this->assertSame(array(), $this->input->get());
-		$this->assertNull($this->input->get('foo'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_get_exist()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$_GET['foo'] = 'bar';
-
-		$this->assertArrayHasKey('foo', $this->input->get());
-		$this->assertEquals('bar', $this->input->get('foo'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_get_exist_with_xss_clean()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$_GET['harm'] = "Hello, i try to  your site";
-
-		$this->assertArrayHasKey('harm', $this->input->get());
-		$this->assertEquals("Hello, i try to  your site", $this->input->get('harm'));
-		$this->assertEquals("Hello, i try to [removed]alert('Hack');[removed] your site", $this->input->get('harm', TRUE));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_post_not_exists()
-	{
-		$this->assertSame(array(), $this->input->post());
-		$this->assertNull($this->input->post('foo'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_post_exist()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$_POST['foo'] = 'bar';
-
-		$this->assertArrayHasKey('foo', $this->input->post());
-		$this->assertEquals('bar', $this->input->post('foo'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_post_exist_with_xss_clean()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$_POST['harm'] = "Hello, i try to  your site";
-
-		$this->assertArrayHasKey('harm', $this->input->post());
-		$this->assertEquals("Hello, i try to  your site", $this->input->post('harm'));
-		$this->assertEquals("Hello, i try to [removed]alert('Hack');[removed] your site", $this->input->post('harm', TRUE));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_post_get()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$_POST['foo'] = 'bar';
-
-		$this->assertEquals('bar', $this->input->post_get('foo'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_get_post()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$_GET['foo'] = 'bar';
-
-		$this->assertEquals('bar', $this->input->get_post('foo'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_cookie()
-	{
-		$_COOKIE['foo'] = 'bar';
-		$this->assertEquals('bar', $this->input->cookie('foo'));
-		$this->assertNull($this->input->cookie('bar'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_server()
-	{
-		$this->assertEquals('GET', $this->input->server('REQUEST_METHOD'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_fetch_from_array()
-	{
-		$data = array(
-			'foo' => 'bar',
-			'harm' => 'Hello, i try to  your site',
-		);
-
-		$foo = $this->input->fetch_from_array($data, 'foo');
-		$harm = $this->input->fetch_from_array($data, 'harm');
-		$harmless = $this->input->fetch_from_array($data, 'harm', TRUE);
-
-		$this->assertEquals('bar', $foo);
-		$this->assertEquals("Hello, i try to  your site", $harm);
-		$this->assertEquals("Hello, i try to [removed]alert('Hack');[removed] your site", $harmless);
-
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$_POST['foo']['bar'] = 'baz';
-		$barArray = array('bar' => 'baz');
-
-		$this->assertEquals('baz', $this->input->post('foo[bar]'));
-		$this->assertEquals($barArray, $this->input->post('foo[]'));
-		$this->assertNull($this->input->post('foo[baz]'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_valid_ip()
-	{
-		$this->assertTrue($this->input->valid_ip('192.18.0.1'));
-		$this->assertTrue($this->input->valid_ip('192.18.0.1', 'ipv4'));
-		$this->assertFalse($this->input->valid_ip('555.0.0.0'));
-		$this->assertFalse($this->input->valid_ip('2001:db8:0:85a3::ac1f:8001', 'ipv4'));
-
-		// v6 tests
-		$this->assertFalse($this->input->valid_ip('192.18.0.1', 'ipv6'));
-
-		$ip_v6 = array(
-			'2001:0db8:0000:85a3:0000:0000:ac1f:8001',
-			'2001:db8:0:85a3:0:0:ac1f:8001',
-			'2001:db8:0:85a3::ac1f:8001'
-		);
-
-		foreach ($ip_v6 as $ip)
-		{
-			$this->assertTrue($this->input->valid_ip($ip));
-			$this->assertTrue($this->input->valid_ip($ip, 'ipv6'));
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_method()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$this->assertEquals('get', $this->input->method());
-		$this->assertEquals('GET', $this->input->method(TRUE));
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$this->assertEquals('post', $this->input->method());
-		$this->assertEquals('POST', $this->input->method(TRUE));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_is_ajax_request()
-	{
-		$this->assertFalse($this->input->is_ajax_request());
-		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'test';
-		$this->assertFalse($this->input->is_ajax_request());
-		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
-		$this->assertTrue($this->input->is_ajax_request());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_input_stream()
-	{
-		$this->markTestSkipped('TODO: Find a way to test input://');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_set_cookie()
-	{
-		$this->markTestSkipped('TODO: Find a way to test HTTP headers');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_get_request_header()
-	{
-		$this->markTestSkipped('TODO: Find a way to test HTTP headers');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_ip_address()
-	{
-		$this->input->ip_address = '127.0.0.1';
-		$this->assertEquals('127.0.0.1', $this->input->ip_address());
-
-		// 127.0.0.1 is set in our Bootstrap file
-		$this->input->ip_address = FALSE;
-		$this->assertEquals('127.0.0.1', $this->input->ip_address());
-
-		// Invalid
-		$_SERVER['REMOTE_ADDR'] = 'invalid_ip_address';
-		$this->input->ip_address = FALSE; // reset cached value
-		$this->assertEquals('0.0.0.0', $this->input->ip_address());
-
-		$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-
-		// Proxy_ips tests
-		$this->input->ip_address = FALSE;
-		$this->ci_set_config('proxy_ips', '127.0.0.3, 127.0.0.4, 127.0.0.2');
-		$_SERVER['HTTP_CLIENT_IP'] = '127.0.0.2';
-		$this->assertEquals('127.0.0.1', $this->input->ip_address());
-
-		// Invalid spoof
-		$this->input->ip_address = FALSE;
-		$this->ci_set_config('proxy_ips', 'invalid_ip_address');
-		$_SERVER['HTTP_CLIENT_IP'] = 'invalid_ip_address';
-		$this->assertEquals('127.0.0.1', $this->input->ip_address());
-
-		$this->input->ip_address = FALSE;
-		$this->ci_set_config('proxy_ips', 'http://foo/bar/baz, 127.0.0.1/1');
-		$_SERVER['HTTP_CLIENT_IP'] = '127.0.0.1';
-		$this->assertEquals('127.0.0.1', $this->input->ip_address());
-
-		$this->input->ip_address = FALSE;
-		$this->ci_set_config('proxy_ips', 'http://foo/bar/baz, 127.0.0.2');
-		$_SERVER['HTTP_CLIENT_IP'] = '127.0.0.2';
-		$_SERVER['REMOTE_ADDR'] = '127.0.0.2';
-		$this->assertEquals('127.0.0.2', $this->input->ip_address());
-
-		//IPv6
-		$this->input->ip_address = FALSE;
-		$this->ci_set_config('proxy_ips', 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329/1, FE80:0000:0000:0000:0202:B3FF:FE1E:8300/2');
-		$_SERVER['HTTP_CLIENT_IP'] = 'FE80:0000:0000:0000:0202:B3FF:FE1E:8300';
-		$_SERVER['REMOTE_ADDR'] = 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329';
-		$this->assertEquals('FE80:0000:0000:0000:0202:B3FF:FE1E:8300', $this->input->ip_address());
-
-		$this->input->ip_address = FALSE;
-		$this->ci_set_config('proxy_ips', '0::/32');
-		$_SERVER['HTTP_CLIENT_IP'] = '127.0.0.7';
-		$_SERVER['REMOTE_ADDR'] = '0000:0000:0000:0000:0000:0000:0000:0001';
-		$this->assertEquals('127.0.0.7', $this->input->ip_address());
-
-		$this->input->ip_address = FALSE;
-		$_SERVER['REMOTE_ADDR'] = '127.0.0.1'; // back to reality
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_user_agent()
-	{
-		$_SERVER['HTTP_USER_AGENT'] = 'test';
-		$this->assertEquals('test', $this->input->user_agent());
-	}
-}
diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
deleted file mode 100644
index 4958f42e1..000000000
--- a/tests/codeigniter/core/Lang_test.php
+++ /dev/null
@@ -1,101 +0,0 @@
-ci_core_class('load');
-		$this->ci_instance_var('load', new $loader_cls);
-		$cls = $this->ci_core_class('lang');
-		$this->lang = new $cls;
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_load()
-	{
-		// Regular usage
-		$this->ci_vfs_clone('system/language/english/profiler_lang.php');
-		$this->assertTrue($this->lang->load('profiler', 'english'));
-		$this->assertEquals('URI STRING', $this->lang->language['profiler_uri_string']);
-
-		// Already loaded file
-		$this->assertNull($this->lang->load('profiler', 'english'));
-
-		// Unspecified language (defaults to english)
-		$this->ci_vfs_clone('system/language/english/date_lang.php');
-		$this->assertTrue($this->lang->load('date'));
-		$this->assertEquals('Year', $this->lang->language['date_year']);
-
-		// A language other than english
-		$this->ci_vfs_clone('system/language/english/email_lang.php', 'system/language/german/');
-		$this->assertTrue($this->lang->load('email', 'german'));
-		$this->assertEquals('german', $this->lang->is_loaded['email_lang.php']);
-
-		// Non-existent file
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Unable to load the requested language file: language/english/nonexistent_lang.php'
-		);
-		$this->lang->load('nonexistent');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_non_alpha_idiom()
-	{
-		// Non-alpha idiom (should act the same as unspecified language)
-		// test with existing file
-		$this->ci_vfs_clone('system/language/english/number_lang.php');
-		$this->ci_vfs_clone('system/language/english/number_lang.php', 'system/language/123funny/');
-		$this->assertTrue($this->lang->load('number', '123funny'));
-		$this->assertEquals('Bytes', $this->lang->language['bytes']);
-
-		// test without existing file
-		$this->ci_vfs_clone('system/language/english/email_lang.php');
-		$this->assertTrue($this->lang->load('email', '456funny'));
-		$this->assertEquals('You did not specify a SMTP hostname.', $this->lang->language['email_no_hostname']);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_multiple_file_load()
-	{
-		// Multiple files
-		$this->ci_vfs_clone('system/language/english/profiler_lang.php');
-		$files = array(
-			0 => 'profiler',
-			1 => 'nonexistent'
-		);
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Unable to load the requested language file: language/english/nonexistent_lang.php'
-		);
-		$this->lang->load($files, 'english');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_alternative_path_load()
-	{
-		// Alternative Path
-		$this->ci_vfs_clone('system/language/english/profiler_lang.php');
-		$this->assertTrue($this->lang->load('profiler', 'english', FALSE, TRUE, 'vfs://system/'));
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * @depends	test_load
-	 */
-	public function test_line()
-	{
-		$this->ci_vfs_clone('system/language/english/profiler_lang.php');
-		$this->lang->load('profiler', 'english');
-		$this->assertEquals('URI STRING', $this->lang->line('profiler_uri_string'));
-		$this->assertFalse($this->lang->line('nonexistent_string'));
-		$this->assertFalse($this->lang->line(NULL));
-	}
-}
diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
deleted file mode 100644
index 8c5bb3021..000000000
--- a/tests/codeigniter/core/Loader_test.php
+++ /dev/null
@@ -1,583 +0,0 @@
-ci_core_class('loader');
-		$this->load = new $loader();
-
-		// Get CI instance
-		$this->ci_obj = $this->ci_instance();
-
-		// Set subclass prefix
-		$this->prefix = 'MY_';
-		$this->ci_set_config('subclass_prefix', $this->prefix);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_library()
-	{
-		// Test getting CI_Loader object
-		$this->assertInstanceOf('CI_Loader', $this->load->library(NULL));
-
-		// Create library in VFS
-		$lib = 'unit_test_lib';
-		$class = 'CI_'.ucfirst($lib);
-		$this->ci_vfs_create(ucfirst($lib), 'ci_base_root, 'libraries');
-
-		// Test is_loaded fail
-		$this->assertFalse($this->load->is_loaded(ucfirst($lib)));
-
-		// Test loading as an array.
-		$this->assertInstanceOf('CI_Loader', $this->load->library(array($lib)));
-		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $lib, $this->ci_obj);
-
-		// Create library in VFS
-		$lib = array('unit_test_lib' => 'unit_test_lib');
-
-		// Test loading as an array (int).
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
-		$this->assertTrue(class_exists($class), $class.' does not exist');
-
-		// Test a string given to params
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib, ' '));
-
-		// test non existent lib
-		$lib = 'non_existent_test_lib';
-
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Unable to load the requested class: '.ucfirst($lib)
-		);
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_bad_library()
-	{
-		$lib = 'bad_test_lib';
-		$this->ci_vfs_create(ucfirst($lib), '', $this->ci_app_root, 'libraries');
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Non-existent class: '.ucfirst($lib)
-		);
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_library_extension()
-	{
-		// Create library and extension in VFS
-		$name = 'ext_test_lib';
-		$lib = ucfirst($name);
-		$class = 'CI_'.$lib;
-		$ext = $this->prefix.$lib;
-		$this->ci_vfs_create($lib, 'ci_base_root, 'libraries');
-		$this->ci_vfs_create($ext, 'ci_app_root, 'libraries');
-
-		// Test loading with extension
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
-		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertTrue(class_exists($ext), $ext.' does not exist');
-		$this->assertAttributeInstanceOf($class, $name, $this->ci_obj);
-		$this->assertAttributeInstanceOf($ext, $name, $this->ci_obj);
-
-		// Test reloading with object name
-		$obj = 'exttest';
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib, NULL, $obj));
-		$this->assertAttributeInstanceOf($class, $obj, $this->ci_obj);
-		$this->assertAttributeInstanceOf($ext, $obj, $this->ci_obj);
-
-		// Test reloading
-		unset($this->ci_obj->$name);
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
-		$this->assertObjectHasAttribute($name, $this->ci_obj);
-
-		// Create baseless library
-		$name = 'ext_baseless_lib';
-		$lib = ucfirst($name);
-		$class = $this->prefix.$lib;
-		$this->ci_vfs_create($class, 'ci_app_root, 'libraries');
-
-		// Test missing base class
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Unable to load the requested class: '.$lib
-		);
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_library_config()
-	{
-		// Create library in VFS
-		$lib = 'unit_test_config_lib';
-		$class = 'CI_'.ucfirst($lib);
-		$content = 'config = $params; } }';
-		$this->ci_vfs_create(ucfirst($lib), $content, $this->ci_base_root, 'libraries');
-
-		// Create config file
-		$cfg = array(
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'baz' => false
-		);
-		$this->ci_vfs_create($lib, 'ci_app_root, 'config');
-
-		// Test object name and config
-		$obj = 'testy';
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib, NULL, $obj));
-		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $obj, $this->ci_obj);
-		$this->assertEquals($cfg, $this->ci_obj->$obj->config);
-
-		// Test is_loaded
-		$this->assertEquals($obj, $this->load->is_loaded(ucfirst($lib)));
-
-		// Test to load another class with the same object name
-		$lib = 'another_test_lib';
-		$class = ucfirst($lib);
-		$this->ci_vfs_create(ucfirst($lib), 'ci_app_root, 'libraries');
-		$this->setExpectedException(
-			'RuntimeException',
-			"CI Error: Resource '".$obj."' already exists and is not a ".$class." instance."
-		);
-		$this->load->library($lib, NULL, $obj);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_load_library_in_application_dir()
-	{
-		// Create library in VFS
-		$lib = 'super_test_library';
-		$class = ucfirst($lib);
-		$this->ci_vfs_create(ucfirst($lib), 'ci_app_root, 'libraries');
-
-		// Load library
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
-
-		// Was the model class instantiated.
-		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $lib, $this->ci_obj);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_driver()
-	{
-		// Call the autoloader, to include system/libraries/Driver.php
-		class_exists('CI_Driver_Library', TRUE);
-
-		// Create driver in VFS
-		$driver = 'unit_test_driver';
-		$dir = ucfirst($driver);
-		$class = 'CI_'.$dir;
-		$content = 'ci_vfs_create(ucfirst($driver), $content, $this->ci_base_root, 'libraries/'.$dir);
-
-		// Test loading as an array.
-		$this->assertInstanceOf('CI_Loader', $this->load->driver(array($driver)));
-		$this->assertTrue(class_exists($class), $class.' does not exist');
-		$this->assertAttributeInstanceOf($class, $driver, $this->ci_obj);
-
-		// Test loading as a library with a name
-		$obj = 'testdrive';
-		$this->assertInstanceOf('CI_Loader', $this->load->library($driver, NULL, $obj));
-		$this->assertAttributeInstanceOf($class, $obj, $this->ci_obj);
-
-		// Test a string given to params
-		$this->assertInstanceOf('CI_Loader', $this->load->driver($driver, ' '));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_models()
-	{
-		$this->ci_set_core_class('model', 'CI_Model');
-
-		// Create model in VFS
-		$model = 'Unit_test_model';
-		$content = 'ci_vfs_create($model, $content, $this->ci_app_root, 'models');
-
-		// Load model
-		$this->assertInstanceOf('CI_Loader', $this->load->model($model));
-
-		// Was the model class instantiated.
-		$this->assertTrue(class_exists($model));
-		$this->assertObjectHasAttribute($model, $this->ci_obj);
-
-		// Test no model given
-		$this->assertInstanceOf('CI_Loader', $this->load->model(''));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_model_subdir()
-	{
-		// Make sure base class is loaded - we'll test _ci_include later
-		$this->ci_core_class('model');
-
-		// Create modelin VFS
-		$model = 'Test_sub_model';
-		$base = 'CI_Model';
-		$subdir = 'cars';
-		$this->ci_vfs_create($model, 'ci_app_root,
-			array('models', $subdir));
-
-		// Load model
-		$name = 'testors';
-		$this->assertInstanceOf('CI_Loader', $this->load->model($subdir.'/'.$model, $name));
-
-		// Was the model class instantiated?
-		$this->assertTrue(class_exists($model));
-		$this->assertObjectHasAttribute($name, $this->ci_obj);
-		$this->assertAttributeInstanceOf($base, $name, $this->ci_obj);
-		$this->assertAttributeInstanceOf($model, $name, $this->ci_obj);
-
-		// Test name conflict
-		$obj = 'conflict';
-		$this->ci_obj->$obj = new stdClass();
-		$this->setExpectedException(
-			'RuntimeException',
-			'The model name you are loading is the name of a resource that is already being used: '.$obj
-		);
-		$this->load->model('not_real', $obj);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_non_existent_model()
-	{
-		$this->setExpectedException(
-			'RuntimeException',
-			'Unable to locate the model you have specified: Ci_test_nonexistent_model.php'
-		);
-
-		$this->load->model('ci_test_nonexistent_model.php');
-	}
-
-	// --------------------------------------------------------------------
-
-	// public function testDatabase()
-	// {
-	// 	$this->assertInstanceOf('CI_Loader', $this->load->database());
-	// 	$this->assertInstanceOf('CI_Loader', $this->load->dbutil());
-	// }
-
-	// --------------------------------------------------------------------
-
-	public function test_load_view()
-	{
-		// Create view in VFS
-		$view = 'unit_test_view';
-		$var = 'hello';
-		$value = 'World!';
-		$content = 'This is my test page.  ';
-		$this->ci_vfs_create($view, $content.'ci_app_root, 'views');
-
-		// Test returning view
-		$out = $this->load->view($view, array($var => $value), TRUE);
-		$this->assertEquals($content.$value, $out);
-
-		// Mock output class
-		$output = $this->getMockBuilder('CI_Output')->setMethods(array('append_output'))->getMock();
-		$output->expects($this->once())->method('append_output')->with($content.$value);
-		$this->ci_instance_var('output', $output);
-
-		// Test view output and $vars as an object
-		$vars = new stdClass();
-		$vars->$var = $value;
-		$this->assertInstanceOf('CI_Loader', $this->load->view($view, $vars));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_non_existent_view()
-	{
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Unable to load the requested file: ci_test_nonexistent_view.php'
-		);
-
-		$this->load->view('ci_test_nonexistent_view', array('foo' => 'bar'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_file()
-	{
-		// Create view in VFS
-		$dir = 'views';
-		$file = 'ci_test_mock_file';
-		$content = 'Here is a test file, which we will load now.';
-		$this->ci_vfs_create($file, $content, $this->ci_app_root, $dir);
-
-		// Just like load->view(), take the output class out of the mix here.
-		$out = $this->load->file(APPPATH.$dir.'/'.$file.'.php', TRUE);
-		$this->assertEquals($content, $out);
-
-		// Test non-existent file
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Unable to load the requested file: ci_test_file_not_exists'
-		);
-
-		$this->load->file('ci_test_file_not_exists', TRUE);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_vars()
-	{
-		$key1 = 'foo';
-		$val1 = 'bar';
-		$key2 = 'boo';
-		$val2 = 'hoo';
-		$this->assertInstanceOf('CI_Loader', $this->load->vars(array($key1 => $val1)));
-		$this->assertInstanceOf('CI_Loader', $this->load->vars($key2, $val2));
-		$this->assertEquals($val1, $this->load->get_var($key1));
-		$this->assertEquals(array($key1 => $val1, $key2 => $val2), $this->load->get_vars());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_clear_vars()
-	{
-		$key1 = 'foo';
-		$val1 = 'bar';
-		$key2 = 'boo';
-		$val2 = 'hoo';
-		$this->assertInstanceOf('CI_Loader', $this->load->vars(array($key1 => $val1)));
-		$this->assertInstanceOf('CI_Loader', $this->load->vars($key2, $val2));
-		$this->assertEquals($val1, $this->load->get_var($key1));
-		$this->assertEquals(array($key1 => $val1, $key2 => $val2), $this->load->get_vars());
-
-		$this->assertInstanceOf('CI_Loader', $this->load->clear_vars());
-		$this->assertEquals('', $this->load->get_var($key1));
-		$this->assertEquals('', $this->load->get_var($key2));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_helper()
-	{
-		// Create helper in VFS
-		$helper = 'test';
-		$func = '_my_helper_test_func';
-		$content = 'ci_vfs_create($helper.'_helper', $content, $this->ci_base_root, 'helpers');
-
-		// Create helper extension
-		$exfunc = '_my_extension_func';
-		$content = 'ci_vfs_create($this->prefix.$helper.'_helper', $content, $this->ci_app_root, 'helpers');
-
-		// Load helper
-		$this->assertInstanceOf('CI_Loader', $this->load->helper($helper));
-		$this->assertTrue(function_exists($func), $func.' does not exist');
-		$this->assertTrue(function_exists($exfunc), $exfunc.' does not exist');
-
-		// Create baseless extension
-		$ext = 'bad_ext';
-		$this->ci_vfs_create($this->prefix.$ext.'_helper', '', $this->ci_app_root, 'helpers');
-
-		// Test bad extension
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Unable to load the requested file: helpers/'.$ext.'_helper.php'
-		);
-		$this->load->helper($ext);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_non_existent_helper()
-	{
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Unable to load the requested file: helpers/bad_helper.php'
-		);
-		$this->load->helper('bad');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_loading_multiple_helpers()
-	{
-		// Create helpers in VFS
-		$helpers = array();
-		$funcs = array();
-		$files = array();
-		for ($i = 1; $i <= 3; ++$i) {
-			$helper = 'test'.$i;
-			$helpers[] = $helper;
-			$func = '_my_helper_test_func'.$i;
-			$funcs[] = $func;
-			$files[$helper.'_helper'] = 'ci_vfs_create($files, NULL, $this->ci_base_root, 'helpers');
-
-		// Load helpers
-		$this->assertInstanceOf('CI_Loader', $this->load->helpers($helpers));
-
-		// Verify helper existence
-		foreach ($funcs as $func) {
-			$this->assertTrue(function_exists($func), $func.' does not exist');
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_language()
-	{
-		// Mock lang class and test load call
-		$file = 'test';
-		$lang = $this->getMockBuilder('CI_Lang')->setMethods(array('load'))->getMock();
-		$lang->expects($this->once())->method('load')->with($file);
-		$this->ci_instance_var('lang', $lang);
-		$this->assertInstanceOf('CI_Loader', $this->load->language($file));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_packages()
-	{
-		// Create model in VFS package path
-		$dir = 'third-party';
-		$lib = 'unit_test_package';
-		$class = ucfirst($lib);
-		$this->ci_vfs_create(ucfirst($lib), 'ci_app_root, array($dir, 'libraries'));
-
-		// Get paths
-		$paths = $this->load->get_package_paths(TRUE);
-
-		// Test failed load without path
-		$this->setExpectedException(
-			'RuntimeException',
-			'CI Error: Unable to load the requested class: '.ucfirst($lib)
-		);
-		$this->load->library($lib);
-
-		// Add path and verify
-		$path = APPPATH.$dir.'/';
-		$this->assertInstanceOf('CI_Loader', $this->load->add_package_path($path));
-		$this->assertContains($path, $this->load->get_package_paths(TRUE));
-
-		// Test successful load
-		$this->assertInstanceOf('CI_Loader', $this->load->library($lib));
-		$this->assertTrue(class_exists($class), $class.' does not exist');
-
-		// Add another path
-		$path2 = APPPATH.'another/';
-		$this->assertInstanceOf('CI_Loader', $this->load->add_package_path($path2));
-		$this->assertContains($path2, $this->load->get_package_paths(TRUE));
-
-		// Remove last path
-		$this->assertInstanceOf('CI_Loader', $this->load->remove_package_path());
-		$this->assertNotContains($path2, $this->load->get_package_paths(TRUE));
-
-		// Remove path and verify restored paths
-		$this->assertInstanceOf('CI_Loader', $this->load->remove_package_path($path));
-		$this->assertEquals($paths, $this->load->get_package_paths(TRUE));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_remove_package_path()
-	{
-		$dir = 'third-party';
-		$path = APPPATH.$dir.'/';
-		$path2 = APPPATH.'another/';
-		$paths = $this->load->get_package_paths(TRUE);
-
-		$this->assertInstanceOf('CI_Loader', $this->load->add_package_path($path));
-		$this->assertInstanceOf('CI_Loader', $this->load->remove_package_path($path));
-		$this->assertEquals($paths, $this->load->get_package_paths(TRUE));
-
-		$this->assertInstanceOf('CI_Loader', $this->load->add_package_path($path2));
-		$this->assertInstanceOf('CI_Loader', $this->load->remove_package_path());
-		$this->assertNotContains($path2, $this->load->get_package_paths(TRUE));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_load_config()
-	{
-		$cfg = 'someconfig';
-		$this->assertTrue($this->load->config($cfg, FALSE));
-		$this->assertContains($cfg, $this->ci_obj->config->loaded);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_initialize()
-	{
-		// Create helper in VFS
-		$helper = 'autohelp';
-		$hlp_func = '_autohelp_test_func';
-		$content = 'ci_vfs_create($helper.'_helper', $content, $this->ci_app_root, 'helpers');
-
-		// Create library in VFS
-		$lib = 'autolib';
-		$lib_class = 'CI_'.ucfirst($lib);
-		$this->ci_vfs_create(ucfirst($lib), 'ci_base_root, 'libraries');
-
-		// Create driver in VFS
-		$drv = 'autodrv';
-		$subdir = ucfirst($drv);
-		$drv_class = 'CI_'.$subdir;
-		$this->ci_vfs_create(ucfirst($drv), 'ci_base_root, array('libraries', $subdir));
-
-		// Create model in VFS package path
-		$dir = 'testdir';
-		$path = APPPATH.$dir.'/';
-		$model = 'Automod';
-		$this->ci_vfs_create($model, 'ci_app_root, array($dir, 'models'));
-
-		// Create autoloader config
-		$cfg = array(
-			'packages' => array($path),
-			'helper' => array($helper),
-			'libraries' => array($lib),
-			'drivers' => array($drv),
-			'model' => array($model),
-			'config' => array('config1', 'config2')
-		);
-		$this->ci_vfs_create('autoload', 'ci_app_root, 'config');
-
-		$this->load->initialize();
-
-		// Verify path
-		$this->assertContains($path, $this->load->get_package_paths());
-
-		// Verify helper
-		$this->assertTrue(function_exists($hlp_func), $hlp_func.' does not exist');
-
-		// Verify library
-		$this->assertTrue(class_exists($lib_class), $lib_class.' does not exist');
-		$this->assertAttributeInstanceOf($lib_class, $lib, $this->ci_obj);
-
-		// Verify driver
-		$this->assertTrue(class_exists($drv_class), $drv_class.' does not exist');
-		$this->assertAttributeInstanceOf($drv_class, $drv, $this->ci_obj);
-
-		// Verify model
-		$this->assertTrue(class_exists($model), $model.' does not exist');
-		$this->assertAttributeInstanceOf($model, $model, $this->ci_obj);
-
-		// Verify config calls
-		$this->assertEquals($cfg['config'], $this->ci_obj->config->loaded);
-	}
-}
diff --git a/tests/codeigniter/core/Log_test.php b/tests/codeigniter/core/Log_test.php
deleted file mode 100644
index 103af342b..000000000
--- a/tests/codeigniter/core/Log_test.php
+++ /dev/null
@@ -1,63 +0,0 @@
-setAccessible(TRUE);
-		$threshold  = new ReflectionProperty('CI_Log', '_threshold');
-		$threshold->setAccessible(TRUE);
-		$date_fmt   = new ReflectionProperty('CI_Log', '_date_fmt');
-		$date_fmt->setAccessible(TRUE);
-		$file_ext   = new ReflectionProperty('CI_Log', '_file_ext');
-		$file_ext->setAccessible(TRUE);
-		$file_perms = new ReflectionProperty('CI_Log', '_file_permissions');
-		$file_perms->setAccessible(TRUE);
-		$enabled    = new ReflectionProperty('CI_Log', '_enabled');
-		$enabled->setAccessible(TRUE);
-
-		$this->ci_set_config('log_path', '/root/');
-		$this->ci_set_config('log_threshold', 'z');
-		$this->ci_set_config('log_date_format', 'd.m.Y');
-		$this->ci_set_config('log_file_extension', '');
-		$this->ci_set_config('log_file_permissions', '');
-		$instance = new CI_Log();
-
-		$this->assertEquals($path->getValue($instance), '/root/');
-		$this->assertEquals($threshold->getValue($instance), 1);
-		$this->assertEquals($date_fmt->getValue($instance), 'd.m.Y');
-		$this->assertEquals($file_ext->getValue($instance), 'php');
-		$this->assertEquals($file_perms->getValue($instance), 0644);
-		$this->assertFalse($enabled->getValue($instance));
-
-		$this->ci_set_config('log_path', '');
-		$this->ci_set_config('log_threshold', '0');
-		$this->ci_set_config('log_date_format', '');
-		$this->ci_set_config('log_file_extension', '.log');
-		$this->ci_set_config('log_file_permissions', 0600);
-		$instance = new CI_Log();
-
-		$this->assertEquals($path->getValue($instance), APPPATH.'logs/');
-		$this->assertEquals($threshold->getValue($instance), 0);
-		$this->assertEquals($date_fmt->getValue($instance), 'Y-m-d H:i:s');
-		$this->assertEquals($file_ext->getValue($instance), 'log');
-		$this->assertEquals($file_perms->getValue($instance), 0600);
-		$this->assertEquals($enabled->getValue($instance), TRUE);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_format_line()
-	{
-		$this->ci_set_config('log_path', '');
-		$this->ci_set_config('log_threshold', 0);
-		$instance = new CI_Log();
-
-		$format_line = new ReflectionMethod($instance, '_format_line');
-		$format_line->setAccessible(TRUE);
-		$this->assertEquals(
-			$format_line->invoke($instance, 'LEVEL', 'Timestamp', 'Message'),
-			"LEVEL - Timestamp --> Message\n"
-		);
-	}
-}
diff --git a/tests/codeigniter/core/Model_test.php b/tests/codeigniter/core/Model_test.php
deleted file mode 100644
index 80dc97b3b..000000000
--- a/tests/codeigniter/core/Model_test.php
+++ /dev/null
@@ -1,37 +0,0 @@
-ci_core_class('loader');
-		$this->load = new $loader();
-		$this->ci_obj = $this->ci_instance();
-		$this->ci_set_core_class('model', 'CI_Model');
-
-		$model_code =<<ci_vfs_create('Test_model', $model_code, $this->ci_app_root, 'models');
-		$this->load->model('test_model');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test__get()
-	{
-		$this->assertEquals('foo', $this->ci_obj->test_model->property);
-
-		$this->ci_obj->controller_property = 'bar';
-		$this->assertEquals('bar', $this->ci_obj->test_model->controller_property);
-	}
-
-}
\ No newline at end of file
diff --git a/tests/codeigniter/core/Output_test.php b/tests/codeigniter/core/Output_test.php
deleted file mode 100644
index 887c077d7..000000000
--- a/tests/codeigniter/core/Output_test.php
+++ /dev/null
@@ -1,63 +0,0 @@
-_output_data =<<
-			
-				Basic HTML
-			
-			
-				Test
-			
-		
-HTML;
-		$this->ci_set_config('charset', 'UTF-8');
-		$output = $this->ci_core_class('output');
-		$this->output = new $output();
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_set_get_append_output()
-	{
-		$append = "\n";
-
-		$this->assertEquals(
-			$this->_output_data.$append,
-			$this->output
-				->set_output($this->_output_data)
-				->append_output("\n")
-				->get_output()
-		);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_get_content_type()
-	{
-		$this->assertEquals('text/html', $this->output->get_content_type());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_get_header()
-	{
-		$this->assertNull($this->output->get_header('Non-Existent-Header'));
-
-		// TODO: Find a way to test header() values as well. Currently,
-		//	 PHPUnit prevents this by not using output buffering.
-
-		$this->output->set_content_type('text/plain', 'WINDOWS-1251');
-		$this->assertEquals(
-			'text/plain; charset=WINDOWS-1251',
-			$this->output->get_header('content-type')
-		);
-	}
-
-}
diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php
deleted file mode 100644
index c3113adba..000000000
--- a/tests/codeigniter/core/Security_test.php
+++ /dev/null
@@ -1,353 +0,0 @@
-ci_set_config('csrf_protection', TRUE);
-		$this->ci_set_config('csrf_token_name', 'ci_csrf_token');
-		$this->ci_set_config('csrf_cookie_name', 'ci_csrf_cookie');
-
-		$this->security = new Mock_Core_Security();
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_csrf_verify()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$this->assertInstanceOf('CI_Security', $this->security->csrf_verify());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_csrf_verify_invalid()
-	{
-		// Without issuing $_POST[csrf_token_name], this request will triggering CSRF error
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-
-		$this->setExpectedException('RuntimeException', 'CI Error: The action you have requested is not allowed');
-
-		$this->security->csrf_verify();
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_csrf_verify_valid()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$_POST[$this->security->csrf_token_name] = $this->security->csrf_hash;
-
-		$this->assertInstanceOf('CI_Security', $this->security->csrf_verify());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_get_csrf_hash()
-	{
-		$this->assertEquals($this->security->csrf_hash, $this->security->get_csrf_hash());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_get_csrf_token_name()
-	{
-		$this->assertEquals('ci_csrf_token', $this->security->get_csrf_token_name());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_xss_clean()
-	{
-		$harm_string = "Hello, i try to  your site";
-
-		$harmless_string = $this->security->xss_clean($harm_string);
-
-		$this->assertEquals("Hello, i try to [removed]alert('Hack');[removed] your site", $harmless_string);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_xss_clean_string_array()
-	{
-		$harm_strings = array(
-			"Hello, i try to  your site",
-			"Simple clean string",
-			"Hello, i try to  your site"
-		);
-
-		$harmless_strings = $this->security->xss_clean($harm_strings);
-
-		$this->assertEquals("Hello, i try to [removed]alert('Hack');[removed] your site", $harmless_strings[0]);
-		$this->assertEquals("Simple clean string", $harmless_strings[1]);
-		$this->assertEquals("Hello, i try to [removed]alert('Hack');[removed] your site", $harmless_strings[2]);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_xss_clean_image_valid()
-	{
-		$harm_string = '';
-
-		$xss_clean_return = $this->security->xss_clean($harm_string, TRUE);
-
-//		$this->assertTrue($xss_clean_return);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_xss_clean_image_invalid()
-	{
-		$harm_string = '';
-
-		$xss_clean_return = $this->security->xss_clean($harm_string, TRUE);
-
-		$this->assertFalse($xss_clean_return);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_xss_clean_entity_double_encoded()
-	{
-		$input = 'Clickhere';
-		$this->assertEquals('Clickhere', $this->security->xss_clean($input));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function text_xss_clean_js_link_removal()
-	{
-		// This one is to prevent a false positive
-		$this->assertEquals(
-			"",
-			$this->security->xss_clean("")
-		);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_xss_clean_js_img_removal()
-	{
-		$input = 'Clickhere';
-		$this->assertEquals('', $this->security->xss_clean($input));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function test_xss_clean_sanitize_naughty_html_tags()
-	{
-		$this->assertEquals('<unclosedTag', $this->security->xss_clean('assertEquals('<blink>', $this->security->xss_clean(''));
-		$this->assertEquals('', $this->security->xss_clean(''));
-
-		$this->assertEquals(
-			' src="x">',
-			$this->security->xss_clean(' src="x">')
-		);
-
-		$this->assertEquals(
-			'on=">"x onerror="alert(1)">',
-			$this->security->xss_clean('on=">"x onerror="alert(1)">')
-		);
-
-		$this->assertEquals(
-			"\n><!-\n