Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix #275 -- regression in db::_compile_select(). Thanks @patwork for …

…the patch
  • Loading branch information...
commit 2e1837a3afabe7e6c71fc88d7a4f5e430fa96744 1 parent 02958b5
@gaker gaker authored
Showing with 15 additions and 11 deletions.
  1. +15 −11 system/database/DB_active_rec.php
View
26 system/database/DB_active_rec.php
@@ -60,7 +60,7 @@ class CI_DB_active_record extends CI_DB_driver {
var $ar_cache_set = array();
var $ar_no_escape = array();
-
+ var $ar_cache_no_escape = array();
// --------------------------------------------------------------------
@@ -93,6 +93,7 @@ function select($select = '*', $escape = NULL)
{
$this->ar_cache_select[] = $val;
$this->ar_cache_exists[] = 'select';
+ $this->ar_cache_no_escape[] = $escape;
}
}
}
@@ -1933,16 +1934,17 @@ function flush_cache()
{
$this->_reset_run(
array(
- 'ar_cache_select' => array(),
- 'ar_cache_from' => array(),
- 'ar_cache_join' => array(),
- 'ar_cache_where' => array(),
- 'ar_cache_like' => array(),
- 'ar_cache_groupby' => array(),
- 'ar_cache_having' => array(),
- 'ar_cache_orderby' => array(),
- 'ar_cache_set' => array(),
- 'ar_cache_exists' => array()
+ 'ar_cache_select' => array(),
+ 'ar_cache_from' => array(),
+ 'ar_cache_join' => array(),
+ 'ar_cache_where' => array(),
+ 'ar_cache_like' => array(),
+ 'ar_cache_groupby' => array(),
+ 'ar_cache_having' => array(),
+ 'ar_cache_orderby' => array(),
+ 'ar_cache_set' => array(),
+ 'ar_cache_exists' => array(),
+ 'ar_cache_no_escape' => array()
)
);
}
@@ -1984,6 +1986,8 @@ function _merge_cache()
{
$this->_track_aliases($this->ar_from);
}
+
+ $this->ar_no_escape = $this->ar_cache_no_escape;
}
// --------------------------------------------------------------------

0 comments on commit 2e1837a

Please sign in to comment.
Something went wrong with that request. Please try again.