diff options
| author | Andrey Andreev <narf@devilix.net> | 2018-06-12 15:57:07 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2018-06-12 15:57:07 +0200 |
| commit | b3f7aae1079e8e484437bc67f4c126f34e7903d8 (patch) | |
| tree | 8d5961bc6260fec1769f852f2383656e15e5b77a /user_guide_src/source/changelog.rst | |
| parent | 1fd1494c709ced0b20252976c65145e21be046ee (diff) | |
| parent | 44f53fb063eed55c79d31d0d19eef7ba973b6054 (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/core/CodeIgniter.php
system/libraries/Email.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
Diffstat (limited to 'user_guide_src/source/changelog.rst')
| -rw-r--r-- | user_guide_src/source/changelog.rst | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 22535e2c5..9367e9c0e 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2,6 +2,7 @@ Change Log ########## +<<<<<<< HEAD Version 3.2.0 ============= @@ -126,26 +127,34 @@ Release Date: Not Released - Added 'img_alt' option with a default value of 'captcha'. - Added ability to generate ``data:image/png;base64`` URIs instead of writing image files to disk. - Updated to always create PNG images instead of JPEG. +======= +Version 3.1.10 +============== + +>>>>>>> 3.1-stable Version 3.1.9 ============= -Release Date: Not Released +Release Date: Jun 12, 2018 - **Security** - Updated :doc:`URL Helper <helpers/url_helper>` function :php:func:`auto_link()` to add ``rel="noopener"`` to generated links in order to prevent tab hijacking. + - Fixed a possible session fixation vulnerability where the :doc:`Session Library <libraries/sessions>` enabled ``session.use_strict_mode`` but it didn't actually do anything (thanks to Aamer Shah, Prasanna Kumar). - General Changes - Updated :doc:`Query Builder <database/query_builder>` method ``limit()`` to allow ``0`` values. + - Updated :doc:`Email Library <libraries/email>` and :doc:`Form Validation Library <libraries/form_validation>` to discard the results of failed ``idn_to_ascii()`` calls while validating e-mail addresses. Bug fixes for 3.1.9 ------------------- - Fixed a regression (#5448) - :doc:`Query Builder <database/query_builder>` methods ``like()``, ``or_like()`` (and siblings) didn't apply *dbprefix* or identifier escaping. - Fixed a regression (#5462) - :doc:`Query Builder <database/query_builder>` methods ``like()``, ``or_like()`` (and siblings) produced incorrect SQL syntax when used with ``'before'`` as the third parameter. +- Fixed a bug (#5516) - :doc:`HTML Helper <helpers/html_helper>` functions :php:func:`img()`, :php:func:`link_tag()` would output results with double slashes if a prefix slash was included in their path inputs. Version 3.1.8 ============= |