From 35480f753240dd913dca879e277bd7b710195546 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 28 Jan 2020 21:22:27 +0200 Subject: [ci skip] Add changelog entry for PR #5882 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index fc5cb7067..aed19f646 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -12,6 +12,7 @@ Release Date: Not Released - Improved logging of error conditions in :doc:`CAPTCHA Helper ` function :php:func:`create_captcha()`. - Added ``AUTO_INCREMENT`` support for Oracle 12.1+ to :doc:`Database Forge `. - Added ``FULL [OUTER] JOIN`` support to :doc:`Query Builder `. + - Added support for detecting WebP image type to :doc:`File Uploading Library `. Bug fixes for 3.1.12 ==================== -- cgit v1.2.3-24-g4f1b From 04677270238b52206fc3c3a6894f576d9cc84b98 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 28 Jan 2020 21:39:30 +0200 Subject: [ci skip] Merge pull request #5890 from jerkob/develop Adds a public trans_active function to determine transaction state --- user_guide_src/source/database/db_driver_reference.rst | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/database/db_driver_reference.rst b/user_guide_src/source/database/db_driver_reference.rst index 1f036cd77..94121bffa 100644 --- a/user_guide_src/source/database/db_driver_reference.rst +++ b/user_guide_src/source/database/db_driver_reference.rst @@ -169,6 +169,13 @@ This article is intended to be a reference for them. Lets you retrieve the transaction status flag to determine if it has failed. + + .. php:method:: trans_active() + + :returns: TRUE if a transaction is active, FALSE if not + :rtype: bool + + Determines if a transaction is currently active. .. php:method:: compile_binds($sql, $binds) -- cgit v1.2.3-24-g4f1b From e9b8c4cc3bb9f676c8e1e3268caf470720c5a33c Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 28 Jan 2020 21:41:23 +0200 Subject: [ci skip] Add changelog entry for PR #5890 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index aed19f646..3c572ac7b 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -13,6 +13,7 @@ Release Date: Not Released - Added ``AUTO_INCREMENT`` support for Oracle 12.1+ to :doc:`Database Forge `. - Added ``FULL [OUTER] JOIN`` support to :doc:`Query Builder `. - Added support for detecting WebP image type to :doc:`File Uploading Library `. + - Added method :doc:`Database Library ` method ``trans_active()`` to expose transaction state. Bug fixes for 3.1.12 ==================== -- cgit v1.2.3-24-g4f1b From fc2da40c4451f61974d11d8d93d532c342d87f83 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 28 Jan 2020 21:42:18 +0200 Subject: [ci skip] Docs spaces-to-tabs correction --- user_guide_src/source/database/db_driver_reference.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/database/db_driver_reference.rst b/user_guide_src/source/database/db_driver_reference.rst index 94121bffa..da33662b0 100644 --- a/user_guide_src/source/database/db_driver_reference.rst +++ b/user_guide_src/source/database/db_driver_reference.rst @@ -164,7 +164,7 @@ This article is intended to be a reference for them. .. php:method:: trans_status() - :returns: TRUE if the transaction succeeded, FALSE if it failed + :returns: TRUE if the transaction succeeded, FALSE if it failed :rtype: bool Lets you retrieve the transaction status flag to @@ -443,4 +443,4 @@ This article is intended to be a reference for them. insert the table prefix (if it exists) in the proper position, and escape only the correct identifiers. - This method is used extensively by the Query Builder class. \ No newline at end of file + This method is used extensively by the Query Builder class. -- cgit v1.2.3-24-g4f1b From ac2e0d0c7c1859a2d96ec01c48abd917a36f8f27 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 11 Feb 2020 21:06:14 +0200 Subject: [ci skip] Fix #5901 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 3c572ac7b..2a4a5bd56 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -23,6 +23,7 @@ Bug fixes for 3.1.12 - Fixed a bug (#5857) - :doc:`Session ` 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 ` 'redis' driver would always use phpRedis 5 ``del()`` due to an incorrect version check. - Fixed a bug (#5879) - :doc:`Profiler Library ` triggered an ``E_DEPRECATED`` warning on PHP 7.4+. +- Fixed a bug (#5901) - :doc:`Database Library ` methods ``list_fields()`` and ``field_data()`` ignored the configured table schema on PostgreSQL. Version 3.1.11 ============== -- cgit v1.2.3-24-g4f1b From e76cd850177fefae34c570e5b49c0ba18955c3b5 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 30 Mar 2020 11:37:58 +0300 Subject: [ci skip] Fix #5906 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 2a4a5bd56..a28e5914f 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -24,6 +24,7 @@ Bug fixes for 3.1.12 - Fixed a bug (#5861) - :doc:`Cache Library ` 'redis' driver would always use phpRedis 5 ``del()`` due to an incorrect version check. - Fixed a bug (#5879) - :doc:`Profiler Library ` triggered an ``E_DEPRECATED`` warning on PHP 7.4+. - Fixed a bug (#5901) - :doc:`Database Library ` methods ``list_fields()`` and ``field_data()`` ignored the configured table schema on PostgreSQL. +- Fixed a bug (#5906) - :doc:`Database Library ` 'postgre' driver couldn't use the failover feature without a ``$config['dsn']``. Version 3.1.11 ============== -- cgit v1.2.3-24-g4f1b From 2505e8c0944b04b2592953f5975fe4d9caee9706 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 30 Mar 2020 11:49:52 +0300 Subject: [ci skip] Add changelog entry for #5903 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index a28e5914f..be9361e59 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -25,6 +25,7 @@ Bug fixes for 3.1.12 - Fixed a bug (#5879) - :doc:`Profiler Library ` triggered an ``E_DEPRECATED`` warning on PHP 7.4+. - Fixed a bug (#5901) - :doc:`Database Library ` methods ``list_fields()`` and ``field_data()`` ignored the configured table schema on PostgreSQL. - Fixed a bug (#5906) - :doc:`Database Library ` 'postgre' driver couldn't use the failover feature without a ``$config['dsn']``. +- Fixed a bug (#5903) - :doc:`common function ` :php:func:`set_status_header()` didn't recognize 'HTTP/2.0' as a valid ``$_SERVER['SERVER_PROTOCOL']``. Version 3.1.11 ============== -- cgit v1.2.3-24-g4f1b From 84970ee6be787ec51ecb688385b6d3372afb7370 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 30 Mar 2020 12:00:06 +0300 Subject: [ci skip] Add changelog entry for PR #5895 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index be9361e59..9ca8f19b4 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -14,6 +14,7 @@ Release Date: Not Released - Added ``FULL [OUTER] JOIN`` support to :doc:`Query Builder `. - Added support for detecting WebP image type to :doc:`File Uploading Library `. - Added method :doc:`Database Library ` method ``trans_active()`` to expose transaction state. + - Updated :doc:`Database Library ` 'pdo' driver to attempt to free resources in order to allow connections to be closed. Bug fixes for 3.1.12 ==================== -- cgit v1.2.3-24-g4f1b From f27b3409b00c6a08d89c1e6b06e5f1b9463d703d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 30 Mar 2020 12:06:02 +0300 Subject: [ci skip] Update upgrade instructions for 3.1.12 --- user_guide_src/source/installation/upgrade_3112.rst | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/installation/upgrade_3112.rst b/user_guide_src/source/installation/upgrade_3112.rst index 1000010ab..93bcc43d3 100644 --- a/user_guide_src/source/installation/upgrade_3112.rst +++ b/user_guide_src/source/installation/upgrade_3112.rst @@ -18,3 +18,9 @@ Step 2: Replace config/user_agents.php This config file has received some updates. Please copy it to *application/config/user_agents.php*. + +Step 3: Replace config/mimes.php +================================ + +This config file has received some updates. Please copy it to +*application/config/mimes.php*. -- cgit v1.2.3-24-g4f1b From 3de79e995faf021fab70b6a82ec57e9fdb0dbedb Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 9 Jul 2020 11:33:52 +0300 Subject: [ci skip] Merge pull request #5970 from sapics/fix/user-guide-url Fix user guide url --- user_guide_src/source/installation/upgrade_150.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/installation/upgrade_150.rst b/user_guide_src/source/installation/upgrade_150.rst index 50eb5eae5..527e4548d 100644 --- a/user_guide_src/source/installation/upgrade_150.rst +++ b/user_guide_src/source/installation/upgrade_150.rst @@ -49,8 +49,8 @@ Open your application/config/config.php file and ADD these new items:: | This item allows you to set the filename/classname prefix when extending | native libraries. For more information please see the user guide: | - | https://codeigniter.com/user_guide/general/core_classes.html - | https://codeigniter.com/user_guide/general/creating_libraries.html + | https://codeigniter.com/userguide3/general/core_classes.html + | https://codeigniter.com/userguide3/general/creating_libraries.html | */ $config['subclass_prefix'] = 'MY_'; -- cgit v1.2.3-24-g4f1b