Permalink
Browse files

Fix issues #751 and #2004

  • Loading branch information...
1 parent be18b96 commit eae17d19fa32847f2b5a0a1b195f912dc8386ecf @narfbg narfbg committed Nov 17, 2012
Showing with 4 additions and 3 deletions.
  1. +2 −3 system/database/DB_query_builder.php
  2. +2 −0 user_guide_src/source/changelog.rst
@@ -2513,8 +2513,7 @@ protected function _merge_cache()
{
continue;
}
-
- $this->$qb_variable = array_unique(array_merge($this->$qb_cache_var, $this->$qb_variable));
+ $this->$qb_variable = array_merge($this->$qb_variable, array_diff($this->$qb_cache_var, $this->$qb_variable));
}
// If we are "protecting identifiers" we need to examine the "from"
@@ -2524,7 +2523,7 @@ protected function _merge_cache()
$this->_track_aliases($this->qb_from);
}
- $this->qb_no_escape = $this->qb_cache_no_escape;
+ $this->qb_no_escape = array_merge($this->qb_no_escape, array_diff($this->qb_cache_no_escape, $this->qb_no_escape));
}
// --------------------------------------------------------------------
@@ -467,6 +467,8 @@ Bug fixes for 2.1.3
- Fixed a bug (#940) - ``csrf_verify()`` used to set the CSRF cookie while processing a POST request with no actual POST data, which resulted in validating a request that should be considered invalid.
- Fixed a bug (#499) - :doc:`Security Library <libraries/security>` where a CSRF cookie was created even if ``$config['csrf_protection']`` is set tot FALSE.
- Fixed a bug (#1715) - :doc:`Input Library <libraries/input>` triggered ``csrf_verify()`` on CLI requests.
+- Fixed a bug (#751) - :doc:`Query Builder <database/query_builder>` didn't properly handle cached field escaping overrides.
+- Fixed a bug (#2004) - :doc:`Query Builder <database/query_builder>` didn't properly merge cached calls with non-cache ones.
Version 2.1.2
=============

0 comments on commit eae17d1

Please sign in to comment.