summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-02-21 14:59:34 +0100
committerAndrey Andreev <narf@bofh.bg>2013-02-21 14:59:34 +0100
commit3e01437a5b23d9ffdf1b1cc9fc0a0f8b66551342 (patch)
treee14348ecdd8781736231f6e046eec5f7eed6756a
parent73cf876a65aa24c1dd4e25dd323f83a11bad3fbe (diff)
Manually apply PR #2234
-rw-r--r--system/database/DB_query_builder.php1
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 2 insertions, 0 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index c7bc4a699..85a233b50 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2627,6 +2627,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
$this->_reset_run(array(
'qb_set' => array(),
'qb_from' => array(),
+ 'qb_join' => array(),
'qb_where' => array(),
'qb_orderby' => array(),
'qb_keys' => array(),
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1b6cff10e..216bf80bc 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -486,6 +486,7 @@ Bug fixes for 3.0
- Fixed a bug (#2211) - :doc:`Migration Library <libraries/migration>` extensions couldn't execute ``CI_Migration::__construct()``.
- Fixed a bug (#2255) - :doc:`Email Library <libraries/email>` didn't apply ``smtp_timeout``to socket reads and writes.
- Fixed a bug (#2239) - :doc:`Email Library <libraries/email>` improperly handled the Subject when used with ``bcc_batch_mode`` resulting in E_WARNING messages and an empty Subject.
+- Fixed a bug (#2234) - :doc:`Query Builder <database/query_builder>` didn't reset JOIN cache for write-type queries.
Version 2.1.3
=============