summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2008-09-30 23:55:34 +0200
committerRick Ellis <rick.ellis@ellislab.com>2008-09-30 23:55:34 +0200
commit852160a27ba330f9e47f4fb16d8042c6074f435c (patch)
tree1ff71dc82f37476c0502eea3d928b658ef36565e /system
parent02d2a9cb400287e54c09f51b9027a99c779d7131 (diff)
Swiched to escape() rather then escape_str(), as per bug report #4680
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_active_rec.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index cd616336d..e7920d083 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -701,7 +701,7 @@ class CI_DB_active_record extends CI_DB_driver {
$prefix = (count($this->ar_like) == 0) ? '' : $type;
- $v = $this->escape_str($v);
+ $v = $this->escape($v);
if ($side == 'before')
{
@@ -851,7 +851,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;