summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/changelog.rst
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-04-29 00:01:28 +0200
committerAndrey Andreev <narf@devilix.net>2014-04-29 00:01:28 +0200
commite0839c3f2aba473f5cb7e81d30ebbb4e0d4d16a5 (patch)
tree156da1efb6508cbcf72e346cd7e95c77d07bb3b3 /user_guide_src/source/changelog.rst
parentfd6efad5ac8bd5e7d08266ec407016221cd9ce99 (diff)
parent15f1e247193617d351868bdc9c280f64334f0d7f (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide_src/source/changelog.rst')
-rw-r--r--user_guide_src/source/changelog.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 125197434..edf0a497b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -278,7 +278,7 @@ Release Date: Not Released
- Library changed to :doc:`Driver <general/drivers>` with classic 'cookie' driver as the default.
- Added a 'native' PHP Session driver to work with ``$_SESSION``.
- - Added a new **tempdata** feature that allows setting userdata items with expiration time (``tempdata()``, ``set_tempdata()``, ``unset_tempdata()``).
+ - Added a new **tempdata** feature that allows setting userdata items with expiration time (``tempdata()``, ``set_tempdata()``, ``unset_tempdata()``).
- Added default ``$config['sess_driver']`` and ``$config['sess_valid_drivers']`` items to *application/config.php* file.
- Changed 'cookie' driver to respect php.ini's *session.gc_probability* and *session.gc_divisor* settings.
- Changed 'cookie' driver to use HMAC authentication instead of a simple md5 checksum.
@@ -507,7 +507,7 @@ Release Date: Not Released
- :doc:`Language Library <libraries/language>` changes include:
- Changed method ``load()`` to filter the language name with ``ctype_alpha()``.
- - Added an optional second parameter to method ``line()`` to disable error login for line keys that were not found.
+ - Added an optional second parameter to method ``line()`` to disable error logging for line keys that were not found.
- Language files are now loaded in a cascading style with the one in **system/** always loaded and overriden afterwards, if another one is found.
- :doc:`Hooks Library <general/hooks>` changes include: