diff options
| author | Andrey Andreev <narf@devilix.net> | 2022-01-15 14:10:11 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2022-01-15 14:10:11 +0100 |
| commit | 882cfd6484b94b7f8743ab2da317922f1f384b64 (patch) | |
| tree | 20eeb9c5676d982284cc7db6fc6bda3339bb381d | |
| parent | d314be05ec50dace2cd8dc94b81e285208bc3a76 (diff) | |
| parent | 6a7254ca653b08e2b73ffd58b18c2bf70b8bd35e (diff) | |
Merge branch '3.1-stable' into develop
| -rw-r--r-- | system/libraries/Session/Session.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php index cef5ba499..95defbedb 100644 --- a/system/libraries/Session/Session.php +++ b/system/libraries/Session/Session.php @@ -182,7 +182,7 @@ class CI_Session { if ( ! $this->_config['cookie_secure'] && $this->_config['cookie_samesite'] === 'None') { - log_message('error', 'Session:', $this->_config['cookie_name'].' cookie sent with SameSite=None, but without Secure attribute.'); + log_message('error', "Session: '".$this->_config['cookie_name']."' cookie sent with SameSite=None, but without Secure attribute.'"); } } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index cfe0ceba7..28d368c34 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -181,6 +181,7 @@ Bug fixes for 3.1.12 - Fixed a bug (#5903) - :doc:`common function <general/common_functions>` :php:func:`set_status_header()` didn't recognize 'HTTP/2.0' as a valid ``$_SERVER['SERVER_PROTOCOL']``. - Fixed a bug (#6013) - :doc:`Session <libraries/sessions>` flashdata didn't work on PHP 8. - Fixed a bug (#6006) - ``is_callable()`` change in PHP 8 broke :doc:`Migrations <libraries/migration>`, a part of :doc:`XML-RPC <libraries/xmlrpc>` and an edge case in 404 detection logic. +- Fixed a bug (#5729) - :doc:`Query Builder <database/query_builder>` possibly not detecting ``NOT BETWEEN`` expression. Version 3.1.11 ============== |