summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source
diff options
context:
space:
mode:
authorRepox <storm@err0r.dk>2011-11-24 09:14:04 +0100
committerRepox <storm@err0r.dk>2011-11-24 09:14:04 +0100
commit5fb9a59e6d485ebdbc03fb4bb4f7fb2115246e3a (patch)
tree3c3d32df2e7d461a425d509be96c082c061f6711 /user_guide_src/source
parente45f28c5ab7509ade2a9db0cd574d8a688bc4c3b (diff)
parentc72e172f158747b75ee524b46f5819c4bf3d0eaa (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide_src/source')
-rw-r--r--user_guide_src/source/changelog.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index de2b3664b..b9ca39cee 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -57,6 +57,7 @@ Bug fixes for 3.0
- Unlink raised an error if cache file did not exist when you try to delete it.
- Fixed a bug (#181) where a mis-spelling was in the form validation
language file.
+- Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented.
Version 2.1.0