From dc8dbf23cd97f4fde38f8f614dd49b59da163641 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 3 Mar 2022 14:50:01 +0200 Subject: [ci skip] Merge pull request #6107 from ducng99/patch-1 Fix SessionUpdateTimestampHandlerInterface name --- system/libraries/Session/SessionUpdateTimestampHandlerInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Session/SessionUpdateTimestampHandlerInterface.php b/system/libraries/Session/SessionUpdateTimestampHandlerInterface.php index 4495a1b7a..fe4a321ab 100644 --- a/system/libraries/Session/SessionUpdateTimestampHandlerInterface.php +++ b/system/libraries/Session/SessionUpdateTimestampHandlerInterface.php @@ -49,7 +49,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @author Andrey Andreev * @link https://codeigniter.com/userguide3/libraries/sessions.html */ -interface SessionHandlerInterface { +interface SessionUpdateTimestampHandlerInterface { public function updateTimestamp($session_id, $data); public function validateId($session_id); -- cgit v1.2.3-24-g4f1b From 68ff9c151bbcf6192580f7a09b6097f60bd12af7 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 3 Mar 2022 15:03:46 +0200 Subject: [ci skip] Remove epub-related stuff from build-release script --- build-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-release.sh b/build-release.sh index d05f2fcee..ea5497560 100755 --- a/build-release.sh +++ b/build-release.sh @@ -79,6 +79,6 @@ then fi cp -r user_guide_src/build/html/ user_guide/ -cp user_guide_src/build/epub/CodeIgniter.epub "CodeIgniter ${version_number}.epub" +git add user_guide/ echo "Build complete." -- cgit v1.2.3-24-g4f1b From 2042929bab8ffc14faf6193de0107b7f95abbdaf Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 3 Mar 2022 15:09:04 +0200 Subject: [ci skip] Doc updates for 3.1.13 start and changelog entry for #6107 --- system/core/CodeIgniter.php | 2 +- user_guide_src/source/changelog.rst | 11 +++++++++++ user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 3 ++- user_guide_src/source/installation/upgrade_3113.rst | 14 ++++++++++++++ user_guide_src/source/installation/upgrading.rst | 1 + 6 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 user_guide_src/source/installation/upgrade_3113.rst diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index e1d5d07d1..2a61a32f7 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -56,7 +56,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @var string * */ - const CI_VERSION = '3.1.12-dev'; + const CI_VERSION = '3.1.13-dev'; /* * ------------------------------------------------------ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 71c0a24ef..f7b1d1736 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2,6 +2,17 @@ Change Log ########## +Version 3.1.13 +============== + +Release Date: Mar 3, 2022 +========================= + +Bug fixes for 3.1.13 +==================== + +- Fixed a bug (#6107) - :doc:`Session Library ` broke for PHP 5 due to a misnamed polyfill interface. + Version 3.1.12 ============== diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 30d8aae60..0f3e1b943 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2019 - 2022, CodeIgniter Foundation' # built documents. # # The short X.Y version. -version = '3.1.12-dev' +version = '3.1.13-dev' # The full version, including alpha/beta/rc tags. -release = '3.1.12-dev' +release = '3.1.13-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 180734448..061dc3b8a 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.12-dev (Current version) `_ +- `CodeIgniter v3.1.13-dev (Current version) `_ +- `CodeIgniter v3.1.12 `_ - `CodeIgniter v3.1.11 `_ - `CodeIgniter v3.1.10 `_ - `CodeIgniter v3.1.9 `_ diff --git a/user_guide_src/source/installation/upgrade_3113.rst b/user_guide_src/source/installation/upgrade_3113.rst new file mode 100644 index 000000000..9de342fe6 --- /dev/null +++ b/user_guide_src/source/installation/upgrade_3113.rst @@ -0,0 +1,14 @@ +############################## +Upgrading from 3.1.12 to 3.1.13 +############################## + +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 2499fe24b..fd5a3d482 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.12 to 3.1.13 Upgrading from 3.1.11 to 3.1.12 Upgrading from 3.1.10 to 3.1.11 Upgrading from 3.1.9 to 3.1.10 -- cgit v1.2.3-24-g4f1b