summaryrefslogtreecommitdiffstats
path: root/system/database/DB_active_rec.php
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-05-06 19:17:04 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-05-06 19:17:04 +0200
commit2e1837a3afabe7e6c71fc88d7a4f5e430fa96744 (patch)
tree0cbb28c4ab12f2f207ae6bf87131e6162e6a0a6a /system/database/DB_active_rec.php
parent02958b5b78835a484c1038d77f4bcfc5ae273a2d (diff)
Fix #275 -- regression in db::_compile_select(). Thanks @patwork for the patch
Diffstat (limited to 'system/database/DB_active_rec.php')
-rw-r--r--system/database/DB_active_rec.php26
1 files changed, 15 insertions, 11 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 508f6bedf..d94d4a13c 100644
--- a/system/database/DB_active_rec.php
+++ b/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 @@ class CI_DB_active_record extends CI_DB_driver {
{
$this->ar_cache_select[] = $val;
$this->ar_cache_exists[] = 'select';
+ $this->ar_cache_no_escape[] = $escape;
}
}
}
@@ -1933,16 +1934,17 @@ class CI_DB_active_record extends CI_DB_driver {
{
$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 @@ class CI_DB_active_record extends CI_DB_driver {
{
$this->_track_aliases($this->ar_from);
}
+
+ $this->ar_no_escape = $this->ar_cache_no_escape;
}
// --------------------------------------------------------------------