summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2022-03-03 14:29:55 +0100
committerAndrey Andreev <narf@devilix.net>2022-03-03 14:29:55 +0100
commit87f9ac6ca2eb125f5991243865e7e5e96fd3987b (patch)
treeb4a92bcf815de868aa15b2449be1115c1132316a
parentf73181e2e4036b3f322ddac7bf266b1cf13d06a0 (diff)
parent2042929bab8ffc14faf6193de0107b7f95abbdaf (diff)
Merge branch '3.1-stable' into develop
-rwxr-xr-xbuild-release.sh2
-rw-r--r--user_guide_src/source/changelog.rst10
-rw-r--r--user_guide_src/source/installation/downloads.rst1
-rw-r--r--user_guide_src/source/installation/upgrade_3113.rst14
-rw-r--r--user_guide_src/source/installation/upgrading.rst3
5 files changed, 28 insertions, 2 deletions
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."
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index cb8573db5..463351993 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -149,6 +149,16 @@ Bug fixes for 3.2.0
- Fixed a bug (#5562) - :doc:`Cache Library <libraries/caching>` 'redis' driver would pointlessly attempt to perform its functions if a connection to the Redis server failed.
- Fixed a bug (#92) - :doc:`File Helper <helpers/file_helper>` function :php:func:`get_dir_file_info()` output could have colliding array keys.
+Version 3.1.13
+==============
+
+Release Date: Mar 3, 2022
+
+Bug fixes for 3.1.13
+====================
+
+- Fixed a bug (#6107) - :doc:`Session Library <libraries/sessions>` broke for PHP 5 due to a misnamed polyfill interface.
+
Version 3.1.12
==============
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst
index e52a87ac0..a3268ec41 100644
--- a/user_guide_src/source/installation/downloads.rst
+++ b/user_guide_src/source/installation/downloads.rst
@@ -3,6 +3,7 @@ Downloading CodeIgniter
#######################
- `CodeIgniter v3.2.0-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/develop>`_
+- `CodeIgniter v3.1.13 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.13>`_
- `CodeIgniter v3.1.12 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.12>`_
- `CodeIgniter v3.1.11 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.11>`_
- `CodeIgniter v3.1.10 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.10>`_
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 789c9b32e..dbca2fac7 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,7 +8,8 @@ upgrading from.
.. toctree::
:titlesonly:
- Upgrading from 3.1.10+ to 3.2.x <upgrade_320>
+ Upgrading from 3.1.12+ to 3.2.x <upgrade_320>
+ Upgrading from 3.1.12 to 3.1.13 <upgrade_3113>
Upgrading from 3.1.11 to 3.1.12 <upgrade_3112>
Upgrading from 3.1.10 to 3.1.11 <upgrade_3111>
Upgrading from 3.1.9 to 3.1.10 <upgrade_3110>