summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysqli
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-08 00:39:20 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-08 00:39:20 +0200
commitcaa04f15096590261093dff2a8b59f266a1dcaf5 (patch)
tree49b8ee0d2fe4cc0fc2b4a3afc94562b4022c0a1c /system/database/drivers/mysqli
parent5ef194df98294d5427c0e7582ca88b1fc06e1d72 (diff)
Revert back some escape_identifiers() to proect_identifiers() as the first one can't handle arrays
Diffstat (limited to 'system/database/drivers/mysqli')
-rw-r--r--system/database/drivers/mysqli/mysqli_forge.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php
index a1f58f0f7..e0e98f151 100644
--- a/system/database/drivers/mysqli/mysqli_forge.php
+++ b/system/database/drivers/mysqli/mysqli_forge.php
@@ -62,7 +62,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge {
$sql .= "\n\t".$this->db->escape_identifiers($field);
- empty($attributes['NAME']) OR $sql .= ' '.$this->db->protect_identifiers($attributes['NAME']).' ';
+ empty($attributes['NAME']) OR $sql .= ' '.$this->db->escape_identifiers($attributes['NAME']).' ';
if ( ! empty($attributes['TYPE']))
{
@@ -152,7 +152,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge {
if (is_array($key))
{
$key_name = $this->db->escape_identifiers(implode('_', $key));
- $key = $this->db->escape_identifiers($key);
+ $key = $this->db->protect_identifiers($key);
}
else
{