diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-13 11:40:00 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-13 11:40:00 +0100 |
| commit | 3f71628066254371904ad872ab5d16c01ee21269 (patch) | |
| tree | fdbb82e4d9448f18d3ad316fd16662cd8db78c0d /system/database/drivers/mysql/mysql_forge.php | |
| parent | dd389df69cd1ab74316ac7a7e227a5f47f16f95c (diff) | |
| parent | d153002858256c6f206c8877f4952ed075902f9e (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-helpers-sst
Diffstat (limited to 'system/database/drivers/mysql/mysql_forge.php')
| -rw-r--r-- | system/database/drivers/mysql/mysql_forge.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index 0f251b086..004a5a103 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -151,7 +151,7 @@ class CI_DB_mysql_forge extends CI_DB_forge { if (count($primary_keys) > 0) { - $key_name = $this->db->_protect_identifiers(implode('_', $primary_keys)); + $key_name = $this->db->protect_identifiers(implode('_', $primary_keys)); $sql .= ",\n\tPRIMARY KEY ".$key_name.' ('.implode(', ', $this->db->protect_identifiers($primary_keys)).')'; } @@ -161,12 +161,12 @@ class CI_DB_mysql_forge extends CI_DB_forge { { if (is_array($key)) { - $key_name = $this->db->_protect_identifiers(implode('_', $key)); - $key = $this->db->_protect_identifiers($key); + $key_name = $this->db->protect_identifiers(implode('_', $key)); + $key = $this->db->protect_identifiers($key); } else { - $key_name = $this->db->_protect_identifiers($key); + $key_name = $this->db->protect_identifiers($key); $key = array($key_name); } |