summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-05-06 18:29:57 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-05-06 18:29:57 +0200
commit827f3de2733e85ede6311feb2e4bf73ecf209eb3 (patch)
tree65fb215a49b142be8521c5af99e0e8f75bd19d44 /system/database
parent5d1e32b2fbae74e6f9e1ab2bdb6a3635579ef13e (diff)
Fixed a regression where a PHP error could occur when using some methods.
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_active_rec.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 508f6bedf..83d481699 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -204,6 +204,7 @@ class CI_DB_active_record extends CI_DB_driver {
$sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$alias;
$this->ar_select[] = $sql;
+ $this->ar_no_escape[] = NULL;
if ($this->ar_caching === TRUE)
{