summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/core/CodeIgniter.php2
-rw-r--r--user_guide_src/source/changelog.rst7
-rw-r--r--user_guide_src/source/conf.py4
-rw-r--r--user_guide_src/source/installation/downloads.rst2
4 files changed, 9 insertions, 6 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 34af79f54..56826f1a6 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.10-dev';
+ const CI_VERSION = '3.1.10';
/*
* ------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 58f6d71f0..6ed61649a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -5,9 +5,12 @@ Change Log
Version 3.1.10
==============
+Release Date: Jan 16, 2019
+
- General Changes
- - Added 'ssl_verify' support to the 'pdo/mysql' :doc:`Database <database/index> driver.
+ - Added 'ssl_verify' support to the 'pdo/mysql' :doc:`Database <database/index>` driver.
+ - Renamed :doc:`Inflector Helper <helpers/inflector_helper>` function ``is_countable()`` to :php:func:`word_is_countable()` due to the former colliding with one introduced in PHP 7.3.0.
Bug fixes for 3.1.10
--------------------
@@ -264,7 +267,7 @@ Release Date: Oct 22, 2016
- General Changes
- Added ``E_PARSE`` to the list of error levels detected by the shutdown handler.
- - Updated :doc:`Inflector Helper <helpers/inflector_helper>` :php:func:`is_countable()` with more words.
+ - Updated :doc:`Inflector Helper <helpers/inflector_helper>` ``is_countable()`` with more words.
- Updated :doc:`common function <general/common_functions>` :php:func:`set_status_header()` with new status codes from IETF RFCs
`2817 <https://tools.ietf.org/html/rfc2817>`_ (426)
and `6585 <https://tools.ietf.org/html/rfc6585>`_ (428, 429, 431, 511).
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 8114dc1fd..4f90eb48c 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014 - 2019, British Columbia Institute of Technology'
# built documents.
#
# The short X.Y version.
-version = '3.1.10-dev'
+version = '3.1.10'
# The full version, including alpha/beta/rc tags.
-release = '3.1.10-dev'
+release = '3.1.10'
# 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 5407e44e1..d7d891c80 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.10-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1-stable>`_
+- `CodeIgniter v3.1.10 (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.10>`_
- `CodeIgniter v3.1.9 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.9>`_
- `CodeIgniter v3.1.8 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.8>`_
- `CodeIgniter v3.1.7 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.7>`_