summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-10 00:03:49 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-13 19:25:35 +0200
commit76e621786007907192c3e84cbde3e1a12dbf83fb (patch)
treef9daf41bc9b18db994e13299da1938b73896983b /system
parent090eb6075eac3a16974f6baed236875ee1dc8a90 (diff)
Fixed conflict in changelog.
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_active_rec.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 0a25b3cb5..2af3553ed 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1694,7 +1694,8 @@ class CI_DB_active_record extends CI_DB_driver {
// is because until the user calls the from() function we don't know if there are aliases
foreach ($this->ar_select as $key => $val)
{
- $this->ar_select[$key] = $this->_protect_identifiers($val, FALSE, $this->ar_no_escape[$key]);
+ $no_escape = isset($this->ar_no_escape[$key]) ? $this->ar_no_escape[$key] : NULL;
+ $this->ar_select[$key] = $this->_protect_identifiers($val, FALSE, $no_escape);
}
$sql .= implode(', ', $this->ar_select);