summaryrefslogtreecommitdiffstats
path: root/system/database/DB_active_rec.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-09-22 11:16:06 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-09-22 11:44:42 +0200
commitf74af98b3dcc239fa442b6615a020e10c8d1a833 (patch)
treecd38179981b767b1fc21ab901847a2c5c09f1799 /system/database/DB_active_rec.php
parent8956c3aec70ccc98ce2aa95249fc0d1c70809284 (diff)
parent0f8312aa620ce68a81a2df2e393bb790970b917e (diff)
Merge tag '2.1.4'
Signed-off-by: Florian Pritz <bluewind@xinu.at> Conflicts: application/config/migration.php user_guide/changelog.html
Diffstat (limited to 'system/database/DB_active_rec.php')
-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 841ede28e..4f3c46338 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1404,7 +1404,7 @@ class CI_DB_active_record extends CI_DB_driver {
}
else
{
- $not[] = $k.'-'.$v;
+ $not[] = $k2.'-'.$v2;
}
if ($escape === FALSE)