diff options
author | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-03-06 22:27:46 +0100 |
---|---|---|
committer | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-03-06 22:27:46 +0100 |
commit | 3b1355c595127280d6d84d8b617a91fbeda319f5 (patch) | |
tree | 61e9d7c334e350846ffc3b528fbcbe85b036e1e9 /system/database/drivers/mysqli/mysqli_forge.php | |
parent | 576b47e9947d4f5bc25a3f72e3978a3d7f9ca1de (diff) | |
parent | 738f53448fecd1a27c7f89965fbfc47b3bafdb9b (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/database/DB_driver.php
system/database/DB_query_builder.php
Diffstat (limited to 'system/database/drivers/mysqli/mysqli_forge.php')
-rw-r--r-- | system/database/drivers/mysqli/mysqli_forge.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index 7de036127..744525f02 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -183,7 +183,7 @@ class CI_DB_mysqli_forge extends CI_DB_forge { */ public function _alter_table($alter_type, $table, $fields, $after_field = '') { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table).' '.$alter_type.' '; + $sql = 'ALTER TABLE '.$this->db->protect_identifiers($table).' '.$alter_type.' '; // DROP has everything it needs now. if ($alter_type === 'DROP') |