summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-08-06 12:59:23 +0200
committerAndrey Andreev <narf@devilix.net>2013-08-06 12:59:23 +0200
commit79f888b27bd67724b30aa6dd30e2ae5162b1fea8 (patch)
tree5c175cffa0bdde7a2d969462b0bf544c7b62cff8 /system/database
parente66ab18b2b4fa47bde7dbe1d6b371fcca023237b (diff)
Fix #2501 & another -related bug
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php4
-rw-r--r--system/database/DB_query_builder.php1
2 files changed, 4 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 425657e17..53decf014 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1375,7 +1375,9 @@ abstract class CI_DB_driver {
$fields[$this->protect_identifiers($key)] = $this->escape($val);
}
- return $this->_update($this->protect_identifiers($table, TRUE, NULL, FALSE), $fields);
+ $sql = $this->_update($this->protect_identifiers($table, TRUE, NULL, FALSE), $fields);
+ $this->_reset_write();
+ return $sql;
}
// --------------------------------------------------------------------
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 292621b66..355613c6f 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1846,6 +1846,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
{
$this->query($this->_update_batch($this->protect_identifiers($table, TRUE, NULL, FALSE), array_slice($this->qb_set, $i, 100), $this->protect_identifiers($index)));
$affected_rows += $this->affected_rows();
+ $this->qb_where = array();
}
$this->_reset_write();