summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-11-27 00:02:28 +0100
committerAndrey Andreev <narf@bofh.bg>2012-11-27 00:02:28 +0100
commit1886b85a695364b8e3a2e0334a916eaa741ccfec (patch)
tree5ed6161576b5f0699689f7f95a2f97c4e8eb85c2 /system
parentafd2c3447967c9c0d8a35064cef0a1c8506c2eff (diff)
parent24c560c5c79605df124f208346c8bff5c152cd1c (diff)
Merge pull request #1969 from CoeusCC/patch-2
Error on line 1407 of db_active_rec.php traces to mis-named variables
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 10febb1fc..129eaa7b6 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)