diff options
| author | ftwbzhao <b.zhao1@gmail.com> | 2015-07-06 10:47:54 +0200 |
|---|---|---|
| committer | ftwbzhao <b.zhao1@gmail.com> | 2015-07-06 10:47:54 +0200 |
| commit | 5cd726abed384ce594d07cc59dcd61f613f10d49 (patch) | |
| tree | a59af74d4084620ab360a26a403eb2a7495364d2 /user_guide_src/source | |
| parent | 820f06f63de3da890a87a88161daea0fd1be8caa (diff) | |
| parent | c79a62c5c43c75a3dbc0af77433694340b235047 (diff) | |
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
Conflicts:
user_guide_src/source/changelog.rst
Diffstat (limited to 'user_guide_src/source')
| -rw-r--r-- | user_guide_src/source/changelog.rst | 3 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/unit_testing.rst | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 3cd24c450..92d8bb164 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -23,6 +23,8 @@ Release Date: Not Released - Errors "no_file_selected", "file_partial", "stopped_by_extension", "no_file_types", "invalid_filetype", "bad_filename" are now logged at the 'debug' level. - Errors "file_exceeds_limit", "file_exceeds_form_limit", "invalid_filesize", "invalid_dimensions" are now logged at the 'info' level. + - Added 'is_resource' to the available expectations in :doc:`Unit Testing Library <libraries/unit_testing>`. + Bug fixes for 3.0.1 ------------------- @@ -47,6 +49,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3932) - :doc:`Query Builder <database/query_builder>` didn't properly compile WHERE and HAVING conditions for field names that end with "and", "or". - Fixed a bug in :doc:`Query Builder <database/query_builder>` where ``delete()`` didn't properly work on multiple tables with a WHERE condition previously set via ``where()``. - Fixed a bug (#3952) - :doc:`Database <database/index>` method ``list_fields()`` didn't work with SQLite3. +- Fixed a bug (#3955) - :doc:`Cache Library <libraries/caching>` methods ``increment()`` and ``decrement()`` ignored the 'key_prefix' setting. Version 3.0.0 ============= diff --git a/user_guide_src/source/libraries/unit_testing.rst b/user_guide_src/source/libraries/unit_testing.rst index 026781cb7..57934cba3 100644 --- a/user_guide_src/source/libraries/unit_testing.rst +++ b/user_guide_src/source/libraries/unit_testing.rst @@ -76,6 +76,7 @@ result. Here is a list of allowed comparison types: - is_double - is_array - is_null +- is_resource Generating Reports ================== |