summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2020-01-28 20:16:56 +0100
committerAndrey Andreev <narf@devilix.net>2020-01-28 20:16:56 +0100
commit2b96e73d85365fb05a56e7464cdb341fd5a9d7b8 (patch)
tree7e6a7d5805e1a94abe92f7db43727da739877aed /user_guide_src/source
parentddfe81730f43b20092383165911c5b1c92d4e5f3 (diff)
parentced499f7ad90ff8bb6bf0faa2e24a1593204de9a (diff)
Merge branch '3.1-stable' into develop
Conflicts resolved: .travis.yml system/database/DB_query_builder.php system/helpers/captcha_helper.php system/libraries/Cache/drivers/Cache_redis.php system/libraries/Zip.php
Diffstat (limited to 'user_guide_src/source')
-rw-r--r--user_guide_src/source/changelog.rst16
-rw-r--r--user_guide_src/source/database/forge.rst2
-rw-r--r--user_guide_src/source/installation/upgrade_3112.rst6
3 files changed, 22 insertions, 2 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f5b68e08a..87fd6b9a8 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -135,6 +135,20 @@ Version 3.1.12
Release Date: Not Released
+- General Changes
+
+ - Improved logging of error conditions in :doc:`CAPTCHA Helper <helpers/captcha_helper>` function :php:func:`create_captcha()`.
+ - Added ``AUTO_INCREMENT`` support for Oracle 12.1+ to :doc:`Database Forge <database/forge>`.
+ - Added ``FULL [OUTER] JOIN`` support to :doc:`Query Builder <database/query_builder>`.
+
+Bug fixes for 3.1.12
+====================
+
+- Fixed a bug (#5834) - :doc:`Query Builder <database/query_builder>` method ``count_all_results()`` triggered an SQL error for queries with a ``HAVING`` clause.
+- Fixed a bug (#5840) - :doc:`Cache Library <libraries/caching>` 'redis' driver triggered an ``E_DEPRECATED`` warning about ``sRemove()`` with phpRedis 5.
+- Fixed a bug (#5857) - :doc:`Session <libraries/sessions>` data could be corrupted after a concurrent request write with the 'files' driver due to a filesize cache being incorrect.
+- Fixed a bug (#5861) - :doc:`Cache Library <libraries/caching>` 'redis' driver would always use phpRedis 5 ``del()`` due to an incorrect version check.
+- Fixed a bug (#5879) - :doc:`Profiler Library <general/profiling>` triggered an ``E_DEPRECATED`` warning on PHP 7.4+.
Version 3.1.11
==============
@@ -149,7 +163,7 @@ Release Date: Sep 19, 2019
- Updated the :doc:`Session <libraries/sessions>` and :doc:`Cache <libraries/caching>` libraries' 'redis' driver to work with phpRedis 5.
Bug fixes for 3.1.11
-====================
+--------------------
- Fixed a bug (#5681) - :doc:`Database Forge <database/forge>` method ``modify_column()`` produced erroneous SQL for ``DEFAULT`` attribute changes under PostgreSQL, Firebird.
- Fixed a bug (#5692) - :doc:`Database Forge <database/forge>` didn't handle column nullability with the 'oci8', 'pdo/oci' drivers.
diff --git a/user_guide_src/source/database/forge.rst b/user_guide_src/source/database/forge.rst
index 5af4f2248..c6cacb1b0 100644
--- a/user_guide_src/source/database/forge.rst
+++ b/user_guide_src/source/database/forge.rst
@@ -370,7 +370,7 @@ Class Reference
.. php:method:: drop_column($table, $column_name)
:param string $table: Table name
- :param array $column_name: The column name to drop
+ :param string $column_name: The column name to drop
:returns: TRUE on success, FALSE on failure
:rtype: bool
diff --git a/user_guide_src/source/installation/upgrade_3112.rst b/user_guide_src/source/installation/upgrade_3112.rst
index 9c849d878..1000010ab 100644
--- a/user_guide_src/source/installation/upgrade_3112.rst
+++ b/user_guide_src/source/installation/upgrade_3112.rst
@@ -12,3 +12,9 @@ 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: Replace config/user_agents.php
+================================
+
+This config file has received some updates. Please copy it to
+*application/config/user_agents.php*.