summaryrefslogtreecommitdiffstats
path: root/system/database/DB_query_builder.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-12 11:31:02 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-12 11:31:02 +0200
commit13f5054a478ee52a9ef262216248337ef40d6677 (patch)
tree9d29b8f5c0815deef45b3a8dc7e7f07f1681737f /system/database/DB_query_builder.php
parent9d3aa1bc9f09c226ce0a55c285cb7fe808db5fa7 (diff)
Fix delete() with multiple tables and an erroneous variable
Diffstat (limited to 'system/database/DB_query_builder.php')
-rw-r--r--system/database/DB_query_builder.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 9c6cb7e45..ab04e4db2 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1832,10 +1832,8 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
{
foreach ($table as $single_table)
{
- $this->delete($single_table, $where, $limit, FALSE);
+ $this->delete($single_table, $where, $limit, $reset_data);
}
-
- $this->_reset_write();
return;
}
else
@@ -2109,7 +2107,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
{
$this->qb_groupby[$i] = ($this->qb_groupby[$i]['escape'] === FALSE)
? $this->qb_groupby[$i]['field']
- : $this->protect_identifiers($qb_groupby[$i]['field']);
+ : $this->protect_identifiers($this->qb_groupby[$i]['field']);
}
$sql .= implode(', ', $this->qb_groupby);