summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-09 23:00:37 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-09 23:00:37 +0200
commitef8005b5cda2f7acf930aa88b7380a36bd06721b (patch)
tree67e49ea7b06cf2b1ec03a283c617fb55d3dc5279 /system
parented9324264a4cea861abb98781f260ab170d2ac05 (diff)
parent03fb8ddfb9a9ce827405c106863db5d4678a6636 (diff)
Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into develop
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_active_rec.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index bc11ff436..0a25b3cb5 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -790,7 +790,7 @@ class CI_DB_active_record extends CI_DB_driver {
if ($v != '')
{
- $v = ' '.$this->escape_str($v);
+ $v = ' '.$this->escape($v);
}
$this->ar_having[] = $prefix.$k.$v;