summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-02-15 23:54:08 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-02-15 23:54:08 +0100
commitd0ac1a250608c1fe21f11bb96c4291e38962b187 (patch)
tree341ce3ceff88ab36799409fa4eae5a0c301d51e7
parent44f210543cf6adcac99264d973dd73ea1b0ab37e (diff)
Better potential fix for escaping MySQL keywords with backticks on insert/update.
-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 06ec3cd95..ee72dbbf4 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -954,7 +954,7 @@ class CI_DB_active_record extends CI_DB_driver {
}
else
{
- $this->ar_set[$this->_protect_identifiers($k)] = $this->escape($v);
+ $this->ar_set[$this->_protect_identifiers($k, FALSE, TRUE)] = $this->escape($v);
}
}
@@ -1156,7 +1156,7 @@ class CI_DB_active_record extends CI_DB_driver {
$this->ar_set[] = array();
return;
}
-
+
ksort($row); // puts $row in the same order as our keys
if ($escape === FALSE)